diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-06-09 13:34:52 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-06-09 13:34:52 +0300 |
| commit | e11b82f8f5c7006f7bf271f0db8e8c514cc9baad (patch) | |
| tree | d44b413b5cd14a296a0069eea9e82c1f26f3b61e /mysql-test/main/help.result | |
| parent | 77b3959b5c1528f33ada7aa4445cccf5b5e197b0 (diff) | |
| parent | a9d0bb12e68a11c119a3534f354c7a7ef13dd5b5 (diff) | |
| download | mariadb-git-e11b82f8f5c7006f7bf271f0db8e8c514cc9baad.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'mysql-test/main/help.result')
| -rw-r--r-- | mysql-test/main/help.result | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/mysql-test/main/help.result b/mysql-test/main/help.result index 130aacf6644..2e5fcff2edc 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. +# |