diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2020-01-20 16:15:05 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2020-01-20 16:15:05 +0100 |
| commit | 3a1716a7e79e6fe05a166211002321f73465ec79 (patch) | |
| tree | 8b9eeab4e037c893ea4cd994b5a7d9e1b1825f5b /mysql-test/suite/sys_vars/r/sysvars_innodb,32bit,xtradb.rdiff-disabled | |
| parent | d07664498be9c71c01c7df9f2fb1d18c7060b2e3 (diff) | |
| parent | 7993f893b844d71183956ee30a6fb37fc10ae90c (diff) | |
| download | mariadb-git-3a1716a7e79e6fe05a166211002321f73465ec79.tar.gz | |
Merge branch '10.1' into 10.2
Diffstat (limited to 'mysql-test/suite/sys_vars/r/sysvars_innodb,32bit,xtradb.rdiff-disabled')
| -rw-r--r-- | mysql-test/suite/sys_vars/r/sysvars_innodb,32bit,xtradb.rdiff-disabled | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/suite/sys_vars/r/sysvars_innodb,32bit,xtradb.rdiff-disabled b/mysql-test/suite/sys_vars/r/sysvars_innodb,32bit,xtradb.rdiff-disabled index ff3f5ba1d2c..fe6ec0e6f33 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_innodb,32bit,xtradb.rdiff-disabled +++ b/mysql-test/suite/sys_vars/r/sysvars_innodb,32bit,xtradb.rdiff-disabled @@ -1214,8 +1214,8 @@ COMMAND_LINE_ARGUMENT OPTIONAL VARIABLE_NAME INNODB_VERSION SESSION_VALUE NULL --GLOBAL_VALUE 5.6.45 -+GLOBAL_VALUE 5.6.45-86.1 +-GLOBAL_VALUE 5.6.47 ++GLOBAL_VALUE 5.6.46-86.2 GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE NULL VARIABLE_SCOPE GLOBAL |