diff options
author | Sergei Golubchik <serg@mariadb.org> | 2017-09-22 13:40:04 +0200 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2017-09-22 13:43:32 +0200 |
commit | a753caf13556a92b70c5baaa2a77a6e50f4dc94b (patch) | |
tree | 6aedcd34ed0edbe08e597a2d33cc7ba63bb9e5f3 /mysql-test | |
parent | e0ebe3d0838879d20095aab1addcd6526d6b8f83 (diff) | |
download | mariadb-git-a753caf13556a92b70c5baaa2a77a6e50f4dc94b.tar.gz |
update rdiff after merge
Diffstat (limited to 'mysql-test')
-rw-r--r-- | mysql-test/suite/sys_vars/r/sysvars_innodb,xtradb.rdiff | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/suite/sys_vars/r/sysvars_innodb,xtradb.rdiff b/mysql-test/suite/sys_vars/r/sysvars_innodb,xtradb.rdiff index dc9a5fd05e6..6aa4e32e95e 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_innodb,xtradb.rdiff +++ b/mysql-test/suite/sys_vars/r/sysvars_innodb,xtradb.rdiff @@ -662,7 +662,7 @@ VARIABLE_NAME INNODB_VERSION SESSION_VALUE NULL -GLOBAL_VALUE 5.6.37 -+GLOBAL_VALUE 5.6.36-82.1 ++GLOBAL_VALUE 5.6.36-82.2 GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE NULL VARIABLE_SCOPE GLOBAL |