diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-05-20 17:47:07 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-05-20 17:47:07 +0300 |
commit | f880200974ef757523d56af00c2c5ad23ddc6ff1 (patch) | |
tree | 944ebc063adf646c9cbbec90bf1cfa5e12c912b1 /mysql-test | |
parent | fe291c687d7780e8689785062802c62fc9cff2c0 (diff) | |
download | mariadb-git-f880200974ef757523d56af00c2c5ad23ddc6ff1.tar.gz |
After-merge fix: Correct the 32-bit XtraDB result diff.
Diffstat (limited to 'mysql-test')
-rw-r--r-- | mysql-test/suite/sys_vars/r/sysvars_innodb,32bit,xtradb.rdiff | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/suite/sys_vars/r/sysvars_innodb,32bit,xtradb.rdiff b/mysql-test/suite/sys_vars/r/sysvars_innodb,32bit,xtradb.rdiff index 858df585a7b..f5ce4d77c6b 100644 --- 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 |