summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVicențiu Ciorbaru <vicentiu@mariadb.org>2017-05-17 15:44:11 +0300
committerVicențiu Ciorbaru <vicentiu@mariadb.org>2017-05-17 15:44:11 +0300
commit5fe55b1b0251a894d87488d7dc973b044af12736 (patch)
treea77057c4cc049af4c7ac7de13dbb9439686bbf41
parent339a290d220551255f9995372f632d6d65a05e06 (diff)
downloadmariadb-git-5fe55b1b0251a894d87488d7dc973b044af12736.tar.gz
Fix sys_vars innodb_empty_free_list_algorithm_basic
Post xtradb 5.6.36 merge the output has changed.
-rw-r--r--mysql-test/suite/sys_vars/r/innodb_empty_free_list_algorithm_basic.result2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/suite/sys_vars/r/innodb_empty_free_list_algorithm_basic.result b/mysql-test/suite/sys_vars/r/innodb_empty_free_list_algorithm_basic.result
index f95553e3fa2..771c6e917ac 100644
--- a/mysql-test/suite/sys_vars/r/innodb_empty_free_list_algorithm_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_empty_free_list_algorithm_basic.result
@@ -1,7 +1,7 @@
SET @start_value = @@GLOBAL.innodb_empty_free_list_algorithm;
SELECT @@GLOBAL.innodb_empty_free_list_algorithm;
@@GLOBAL.innodb_empty_free_list_algorithm
-backoff
+legacy
SELECT @@SESSION.innodb_empty_free_list_algorithm;
ERROR HY000: Variable 'innodb_empty_free_list_algorithm' is a GLOBAL variable
SET GLOBAL innodb_empty_free_list_algorithm='legacy';