summaryrefslogtreecommitdiff
path: root/mysql-test/main/myisam_recover.result
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2019-09-06 11:53:10 +0200
committerSergei Golubchik <serg@mariadb.org>2019-09-06 11:53:10 +0200
commit244f0e6dd815b388282c15db4fe7f15533f4c8fc (patch)
treeaf138f2b3739a742c0c38173cdc86ec176fc0edd /mysql-test/main/myisam_recover.result
parent18af13b88ba580562981a190c25da128a2e9db26 (diff)
parent2842c369851a8afc2a944ce6f4f60fa052f20969 (diff)
downloadmariadb-git-244f0e6dd815b388282c15db4fe7f15533f4c8fc.tar.gz
Merge branch '10.3' into 10.4
Diffstat (limited to 'mysql-test/main/myisam_recover.result')
-rw-r--r--mysql-test/main/myisam_recover.result3
1 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/main/myisam_recover.result b/mysql-test/main/myisam_recover.result
index 3a2c424c8b2..da96682186c 100644
--- a/mysql-test/main/myisam_recover.result
+++ b/mysql-test/main/myisam_recover.result
@@ -1,4 +1,5 @@
call mtr.add_suppression("Table 't1' is marked as crashed and should be repaired");
+set @save_table_definition_cache=@@table_definition_cache;
#
# Tests for corrupted MyISAM tables and MyISAMMRG tables with corrupted
# children..
@@ -97,10 +98,10 @@ unlock tables;
prepare stmt from @drop_table_stmt;
execute stmt;
deallocate prepare stmt;
-set @@global.table_definition_cache=default;
set @@global.table_open_cache=@save_table_open_cache;
disconnect con1;
connection default;
+set @@global.table_definition_cache=@save_table_definition_cache;
#
# 18075170 - sql node restart required to avoid deadlock after
# restore