Skip to content
Permalink
Browse files
main.help: flush help tables after modifying them
otherwise following tests that crash the server will see them
corrupted
  • Loading branch information
vuvova committed Jun 7, 2022
1 parent 7c4efab commit 37ea077
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 13 deletions.
@@ -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.
#
@@ -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 #

0 comments on commit 37ea077

Please sign in to comment.