Skip to content

Commit 1f498f9

Browse files
committed
5.6.44-86.0
2 parents d653db3 + c385d80 commit 1f498f9

File tree

5 files changed

+4
-42
lines changed

5 files changed

+4
-42
lines changed

mysql-test/suite/sys_vars/r/sysvars_innodb,32bit,xtradb.rdiff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1215,7 +1215,7 @@
12151215
VARIABLE_NAME INNODB_VERSION
12161216
SESSION_VALUE NULL
12171217
-GLOBAL_VALUE 5.6.45
1218-
+GLOBAL_VALUE 5.6.43-84.3
1218+
+GLOBAL_VALUE 5.6.44-86.0
12191219
GLOBAL_VALUE_ORIGIN COMPILE-TIME
12201220
DEFAULT_VALUE NULL
12211221
VARIABLE_SCOPE GLOBAL

mysql-test/suite/sys_vars/r/sysvars_innodb,xtradb.rdiff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -685,7 +685,7 @@
685685
VARIABLE_NAME INNODB_VERSION
686686
SESSION_VALUE NULL
687687
-GLOBAL_VALUE 5.6.45
688-
+GLOBAL_VALUE 5.6.43-84.3
688+
+GLOBAL_VALUE 5.6.44-86.0
689689
GLOBAL_VALUE_ORIGIN COMPILE-TIME
690690
DEFAULT_VALUE NULL
691691
VARIABLE_SCOPE GLOBAL

storage/innobase/ut/ut0crc32.cc

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -316,26 +316,7 @@ ut_crc32_init()
316316
ut_cpuid(vend, &model, &family, &stepping,
317317
&features_ecx, &features_edx);
318318

319-
/* Valgrind does not understand the CRC32 instructions:
320-
321-
vex amd64->IR: unhandled instruction bytes: 0xF2 0x48 0xF 0x38 0xF0 0xA
322-
valgrind: Unrecognised instruction at address 0xad3db5.
323-
Your program just tried to execute an instruction that Valgrind
324-
did not recognise. There are two possible reasons for this.
325-
1. Your program has a bug and erroneously jumped to a non-code
326-
location. If you are running Memcheck and you just saw a
327-
warning about a bad jump, it's probably your program's fault.
328-
2. The instruction is legitimate but Valgrind doesn't handle it,
329-
i.e. it's Valgrind's fault. If you think this is the case or
330-
you are not sure, please let us know and we'll try to fix it.
331-
Either way, Valgrind will now raise a SIGILL signal which will
332-
probably kill your program.
333-
334-
*/
335-
#ifndef UNIV_DEBUG_VALGRIND
336319
ut_crc32_sse2_enabled = (features_ecx >> 20) & 1;
337-
#endif /* UNIV_DEBUG_VALGRIND */
338-
339320
#endif /* defined(__GNUC__) && defined(__x86_64__) */
340321

341322
#if defined(__linux__) && defined(__powerpc__) && defined(AT_HWCAP2) \

storage/xtradb/include/univ.i

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@ Created 1/20/1994 Heikki Tuuri
4545

4646
#define INNODB_VERSION_MAJOR 5
4747
#define INNODB_VERSION_MINOR 6
48-
#define INNODB_VERSION_BUGFIX 43
48+
#define INNODB_VERSION_BUGFIX 44
4949

5050
#ifndef PERCONA_INNODB_VERSION
51-
#define PERCONA_INNODB_VERSION 84.3
51+
#define PERCONA_INNODB_VERSION 86.0
5252
#endif
5353

5454
/* Enable UNIV_LOG_ARCHIVE in XtraDB */

storage/xtradb/ut/ut0crc32.cc

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -316,26 +316,7 @@ ut_crc32_init()
316316
ut_cpuid(vend, &model, &family, &stepping,
317317
&features_ecx, &features_edx);
318318

319-
/* Valgrind does not understand the CRC32 instructions:
320-
321-
vex amd64->IR: unhandled instruction bytes: 0xF2 0x48 0xF 0x38 0xF0 0xA
322-
valgrind: Unrecognised instruction at address 0xad3db5.
323-
Your program just tried to execute an instruction that Valgrind
324-
did not recognise. There are two possible reasons for this.
325-
1. Your program has a bug and erroneously jumped to a non-code
326-
location. If you are running Memcheck and you just saw a
327-
warning about a bad jump, it's probably your program's fault.
328-
2. The instruction is legitimate but Valgrind doesn't handle it,
329-
i.e. it's Valgrind's fault. If you think this is the case or
330-
you are not sure, please let us know and we'll try to fix it.
331-
Either way, Valgrind will now raise a SIGILL signal which will
332-
probably kill your program.
333-
334-
*/
335-
#ifndef UNIV_DEBUG_VALGRIND
336319
ut_crc32_sse2_enabled = (features_ecx >> 20) & 1;
337-
#endif /* UNIV_DEBUG_VALGRIND */
338-
339320
#endif /* defined(__GNUC__) && defined(__x86_64__) */
340321

341322
#if defined(__linux__) && defined(__powerpc__) && defined(AT_HWCAP2) \

0 commit comments

Comments
 (0)