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

f8802009 · Marko Mäkelä · fe291c68 · f8802009
Commit f8802009 authored May 20, 2017 by Marko Mäkelä
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

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

No files found.
--- a/mysql-test/suite/sys_vars/r/sysvars_innodb,32bit,xtradb.rdiff
+++ b/mysql-test/suite/sys_vars/r/sysvars_innodb,32bit,xtradb.rdiff
@@ -1218,8 +1218,8 @@
 COMMAND_LINE_ARGUMENT	OPTIONAL
 VARIABLE_NAME	INNODB_VERSION
 SESSION_VALUE	NULL
-GLOBAL_VALUE	5.6.35
-+GLOBAL_VALUE	5.6.35-80.0
+-GLOBAL_VALUE	5.6.36
+GLOBAL_VALUE	5.6.36-82.0
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	NULL
 VARIABLE_SCOPE	GLOBAL