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/r/help.result | |
| 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/r/help.result')
| -rw-r--r-- | mysql-test/r/help.result | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/mysql-test/r/help.result b/mysql-test/r/help.result index de8ed249528..16719cc8193 100644 --- a/mysql-test/r/help.result +++ b/mysql-test/r/help.result @@ -257,3 +257,12 @@ 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; +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. |