database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge branch '10.2' into 10.3

Browse Source
This commit is contained in:
Monty
2019-09-02 14:06:56 +03:00
parent b0ff5a6a73 9cba6c5aa3
commit a071e0e029
671 changed files with 11116 additions and 14190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/main/myisam_recover.test
View File

@ -2,6 +2,8 @@
call mtr.add_suppression("Table 't1' is marked as crashed and should be repaired");
set @save_table_definition_cache=@@table_definition_cache;
--echo #
--echo # Tests for corrupted MyISAM tables and MyISAMMRG tables with corrupted
--echo # children..
@ -104,11 +106,11 @@ 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;
--enable_ps_protocol
set @@global.table_definition_cache=@save_table_definition_cache;
--echo #
--echo # 18075170 - sql node restart required to avoid deadlock after