diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2022-06-07 15:49:41 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2022-06-07 18:26:05 +0200 |
| commit | 37ea0778733a21ae603788853ac4fb9a3be9915a (patch) | |
| tree | 9421bc9591f1e21487243f30b71f6e747ec95b6e | |
| parent | 7c4efab9031c2b08af5caf0e3a2b01a70a3414bf (diff) | |
| download | mariadb-git-37ea0778733a21ae603788853ac4fb9a3be9915a.tar.gz | |
main.help: flush help tables after modifying them
otherwise following tests that crash the server will see them
corrupted
| -rw-r--r-- | mysql-test/main/help.result | 10 | ||||
| -rw-r--r-- | mysql-test/main/help.test | 17 |
2 files changed, 14 insertions, 13 deletions
diff --git a/mysql-test/main/help.result b/mysql-test/main/help.result index 66850e75dc1..a3a236ee89e 100644 --- a/mysql-test/main/help.result +++ b/mysql-test/main/help.result @@ -274,12 +274,16 @@ delete from mysql.help_relation where help_keyword_id=@keyword1_id and help_topi delete from mysql.help_relation where help_keyword_id=@keyword2_id and help_topic_id=@topic1_id; delete from mysql.help_relation where help_keyword_id=@keyword3_id and help_topic_id=@topic3_id; delete from mysql.help_relation where help_keyword_id=@keyword3_id and help_topic_id=@topic4_id; -End of 4.1 tests. -DROP TABLE IF EXISTS t1; +flush tables; +# +# End of 4.1 tests. +# CREATE TABLE t1 (i INT); LOCK TABLES t1 WRITE; HELP no_such_topic; name is_it_category UNLOCK TABLES; DROP TABLE t1; -End of 5.1 tests. +# +# End of 5.1 tests. +# diff --git a/mysql-test/main/help.test b/mysql-test/main/help.test index 802f24f80a9..4f1ec5cef70 100644 --- a/mysql-test/main/help.test +++ b/mysql-test/main/help.test @@ -122,25 +122,22 @@ delete from mysql.help_relation where help_keyword_id=@keyword2_id and help_topi delete from mysql.help_relation where help_keyword_id=@keyword3_id and help_topic_id=@topic3_id; delete from mysql.help_relation where help_keyword_id=@keyword3_id and help_topic_id=@topic4_id; ---echo End of 4.1 tests. +flush tables; +--echo # +--echo # End of 4.1 tests. +--echo # # # Test that we can use HELP even under LOCK TABLES. See bug#9953: # CONVERT_TZ requires mysql.time_zone_name to be locked. # ---disable_warnings -DROP TABLE IF EXISTS t1; ---enable_warnings CREATE TABLE t1 (i INT); - LOCK TABLES t1 WRITE; - HELP no_such_topic; - UNLOCK TABLES; - DROP TABLE t1; - ---echo End of 5.1 tests. +--echo # +--echo # End of 5.1 tests. +--echo # |