Skip to content

M
mariadb
Commit 235876d7 authored by Sergei Golubchik's avatar Sergei Golubchik
Browse files
Options

update test results after merge

parent 2ede40e6
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
mysql-test/suite/sys_vars/r/sysvars_innodb,32bit,xtradb.rdiff
View file @ 235876d7
......@@ -1227,8 +1227,8 @@
COMMAND_LINE_ARGUMENT OPTIONAL
VARIABLE_NAME INNODB_VERSION
SESSION_VALUE NULL
-GLOBAL_VALUE 5.6.32
+GLOBAL_VALUE 5.6.31-77.0
-GLOBAL_VALUE 5.6.33
+GLOBAL_VALUE 5.6.32-78.1
GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE NULL
VARIABLE_SCOPE GLOBAL
......
mysql-test/suite/sys_vars/r/sysvars_innodb,xtradb.rdiff
View file @ 235876d7
......@@ -661,8 +661,8 @@
COMMAND_LINE_ARGUMENT OPTIONAL
VARIABLE_NAME INNODB_VERSION
SESSION_VALUE NULL
-GLOBAL_VALUE 5.6.32
+GLOBAL_VALUE 5.6.31-77.0
-GLOBAL_VALUE 5.6.33
+GLOBAL_VALUE 5.6.32-78.1
GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE NULL
VARIABLE_SCOPE GLOBAL
......
mysql-test/suite/sys_vars/r/sysvars_innodb.result
View file @ 235876d7
......@@ -2359,7 +2359,7 @@ READ_ONLY NO
COMMAND_LINE_ARGUMENT OPTIONAL
VARIABLE_NAME INNODB_VERSION
SESSION_VALUE NULL
GLOBAL_VALUE 5.6.32
GLOBAL_VALUE 5.6.33
GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE NULL
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