diff options
| author | unknown <tsmith@quadxeon.mysql.com> | 2007-03-22 01:04:39 +0100 |
|---|---|---|
| committer | unknown <tsmith@quadxeon.mysql.com> | 2007-03-22 01:04:39 +0100 |
| commit | b636ad25c7cb672ec8559ff61cc19a0cee83fb05 (patch) | |
| tree | 34885ae893c0a3acb95069f2687f5e289554a05c /mysql-test/t/help.test | |
| parent | 9e6d54e4a5ddf0aae5b23a9b51507e7bb6b5d5f5 (diff) | |
| parent | 8ed9a54008fae160d63dc27fa02b9ae4348238e7 (diff) | |
| download | mariadb-git-b636ad25c7cb672ec8559ff61cc19a0cee83fb05.tar.gz | |
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
include/my_global.h:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/help.result:
Auto merged
mysql-test/t/help.test:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'mysql-test/t/help.test')
| -rw-r--r-- | mysql-test/t/help.test | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/mysql-test/t/help.test b/mysql-test/t/help.test index de0cefab76c..71821e46771 100644 --- a/mysql-test/t/help.test +++ b/mysql-test/t/help.test @@ -114,4 +114,25 @@ 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; -# End of 4.1 tests +--echo End of 4.1 tests. + +# +# 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. |