diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-06-09 11:53:46 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-06-09 11:53:46 +0300 |
| commit | c89e3b70a740f486db2c60270892ba2893bb5610 (patch) | |
| tree | 946650c0e5e1f84ebb6aa19234c665393a963abd /mysql-test/main/help.test | |
| parent | 5efadf8d8c6076bbee73e45afe050ab62c517f3c (diff) | |
| parent | 98293130c34cfd39bf2e8c904923abe3942d23be (diff) | |
| download | mariadb-git-c89e3b70a740f486db2c60270892ba2893bb5610.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'mysql-test/main/help.test')
| -rw-r--r-- | mysql-test/main/help.test | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/mysql-test/main/help.test b/mysql-test/main/help.test index 725eec2771f..c464e4812bc 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 # |