diff options
author | Alexander Barkov <bar@mariadb.org> | 2018-02-10 21:51:24 +0400 |
---|---|---|
committer | Alexander Barkov <bar@mariadb.org> | 2018-02-10 21:51:24 +0400 |
commit | a2feeb3d6f0b994562d9ad7622438897b253ecd0 (patch) | |
tree | a3d97f1ddc2e5b8342fadf90a7434cbe1ace23ee | |
parent | e07451f71f3b4cd474b1fd8b3395a8cc1a844e1f (diff) | |
download | mariadb-git-a2feeb3d6f0b994562d9ad7622438897b253ecd0.tar.gz |
After-merge fixes for "sys_vars.sysvars_innodb '32bit,xtradb'" test results.
-rw-r--r-- | mysql-test/suite/sys_vars/r/sysvars_innodb,32bit,xtradb.rdiff | 2 |
1 files changed, 1 insertions, 1 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 a57fc12948c..f04fd5ed399 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 @@ -1236,7 +1236,7 @@ VARIABLE_NAME INNODB_VERSION SESSION_VALUE NULL -GLOBAL_VALUE 5.6.37 -+GLOBAL_VALUE 5.6.36-83.0 ++GLOBAL_VALUE 5.6.38-83.0 GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE NULL VARIABLE_SCOPE GLOBAL |