Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
1f498f90
Commit
1f498f90
authored
Jul 23, 2019
by
Marko Mäkelä
Browse files
Options
Browse Files
Download
Plain Diff
5.6.44-86.0
parents
d653db32
c385d80a
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
4 additions
and
42 deletions
+4
-42
mysql-test/suite/sys_vars/r/sysvars_innodb,32bit,xtradb.rdiff
...l-test/suite/sys_vars/r/sysvars_innodb,32bit,xtradb.rdiff
+1
-1
mysql-test/suite/sys_vars/r/sysvars_innodb,xtradb.rdiff
mysql-test/suite/sys_vars/r/sysvars_innodb,xtradb.rdiff
+1
-1
storage/innobase/ut/ut0crc32.cc
storage/innobase/ut/ut0crc32.cc
+0
-19
storage/xtradb/include/univ.i
storage/xtradb/include/univ.i
+2
-2
storage/xtradb/ut/ut0crc32.cc
storage/xtradb/ut/ut0crc32.cc
+0
-19
No files found.
mysql-test/suite/sys_vars/r/sysvars_innodb,32bit,xtradb.rdiff
View file @
1f498f90
...
...
@@ -1215,7 +1215,7 @@
VARIABLE_NAME INNODB_VERSION
SESSION_VALUE NULL
-GLOBAL_VALUE 5.6.45
+GLOBAL_VALUE 5.6.4
3-84.3
+GLOBAL_VALUE 5.6.4
4-86.0
GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE NULL
VARIABLE_SCOPE GLOBAL
...
...
mysql-test/suite/sys_vars/r/sysvars_innodb,xtradb.rdiff
View file @
1f498f90
...
...
@@ -685,7 +685,7 @@
VARIABLE_NAME INNODB_VERSION
SESSION_VALUE NULL
-GLOBAL_VALUE 5.6.45
+GLOBAL_VALUE 5.6.4
3-84.3
+GLOBAL_VALUE 5.6.4
4-86.0
GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE NULL
VARIABLE_SCOPE GLOBAL
...
...
storage/innobase/ut/ut0crc32.cc
View file @
1f498f90
...
...
@@ -316,26 +316,7 @@ ut_crc32_init()
ut_cpuid
(
vend
,
&
model
,
&
family
,
&
stepping
,
&
features_ecx
,
&
features_edx
);
/* Valgrind does not understand the CRC32 instructions:
vex amd64->IR: unhandled instruction bytes: 0xF2 0x48 0xF 0x38 0xF0 0xA
valgrind: Unrecognised instruction at address 0xad3db5.
Your program just tried to execute an instruction that Valgrind
did not recognise. There are two possible reasons for this.
1. Your program has a bug and erroneously jumped to a non-code
location. If you are running Memcheck and you just saw a
warning about a bad jump, it's probably your program's fault.
2. The instruction is legitimate but Valgrind doesn't handle it,
i.e. it's Valgrind's fault. If you think this is the case or
you are not sure, please let us know and we'll try to fix it.
Either way, Valgrind will now raise a SIGILL signal which will
probably kill your program.
*/
#ifndef UNIV_DEBUG_VALGRIND
ut_crc32_sse2_enabled
=
(
features_ecx
>>
20
)
&
1
;
#endif
/* UNIV_DEBUG_VALGRIND */
#endif
/* defined(__GNUC__) && defined(__x86_64__) */
#if defined(__linux__) && defined(__powerpc__) && defined(AT_HWCAP2) \
...
...
storage/xtradb/include/univ.i
View file @
1f498f90
...
...
@@ -45,10 +45,10 @@ Created 1/20/1994 Heikki Tuuri
#
define
INNODB_VERSION_MAJOR
5
#
define
INNODB_VERSION_MINOR
6
#
define
INNODB_VERSION_BUGFIX
4
3
#
define
INNODB_VERSION_BUGFIX
4
4
#
ifndef
PERCONA_INNODB_VERSION
#
define
PERCONA_INNODB_VERSION
8
4.3
#
define
PERCONA_INNODB_VERSION
8
6.0
#
endif
/* Enable UNIV_LOG_ARCHIVE in XtraDB */
...
...
storage/xtradb/ut/ut0crc32.cc
View file @
1f498f90
...
...
@@ -316,26 +316,7 @@ ut_crc32_init()
ut_cpuid
(
vend
,
&
model
,
&
family
,
&
stepping
,
&
features_ecx
,
&
features_edx
);
/* Valgrind does not understand the CRC32 instructions:
vex amd64->IR: unhandled instruction bytes: 0xF2 0x48 0xF 0x38 0xF0 0xA
valgrind: Unrecognised instruction at address 0xad3db5.
Your program just tried to execute an instruction that Valgrind
did not recognise. There are two possible reasons for this.
1. Your program has a bug and erroneously jumped to a non-code
location. If you are running Memcheck and you just saw a
warning about a bad jump, it's probably your program's fault.
2. The instruction is legitimate but Valgrind doesn't handle it,
i.e. it's Valgrind's fault. If you think this is the case or
you are not sure, please let us know and we'll try to fix it.
Either way, Valgrind will now raise a SIGILL signal which will
probably kill your program.
*/
#ifndef UNIV_DEBUG_VALGRIND
ut_crc32_sse2_enabled
=
(
features_ecx
>>
20
)
&
1
;
#endif
/* UNIV_DEBUG_VALGRIND */
#endif
/* defined(__GNUC__) && defined(__x86_64__) */
#if defined(__linux__) && defined(__powerpc__) && defined(AT_HWCAP2) \
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment