Skip to content

M
MariaDB
Commit f8802009 authored by Marko Mäkelä's avatar Marko Mäkelä
Browse files
Options

After-merge fix: Correct the 32-bit XtraDB result diff.

parent fe291c68
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
mysql-test/suite/sys_vars/r/sysvars_innodb,32bit,xtradb.rdiff
View file @ f8802009
...@@ -1218,8 +1218,8 @@ ...@@ -1218,8 +1218,8 @@
COMMAND_LINE_ARGUMENT OPTIONAL COMMAND_LINE_ARGUMENT OPTIONAL
VARIABLE_NAME INNODB_VERSION VARIABLE_NAME INNODB_VERSION
SESSION_VALUE NULL SESSION_VALUE NULL
-GLOBAL_VALUE 5.6.35 -GLOBAL_VALUE 5.6.36
+GLOBAL_VALUE 5.6.35-80.0 +GLOBAL_VALUE 5.6.36-82.0
GLOBAL_VALUE_ORIGIN COMPILE-TIME GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE NULL DEFAULT_VALUE NULL
VARIABLE_SCOPE GLOBAL VARIABLE_SCOPE GLOBAL
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7