diff options
| author | unknown <monty@mysql.com> | 2004-12-08 23:55:01 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-12-08 23:55:01 +0200 |
| commit | 0d12a95dde9f1d5267875e62ee201b0cefc4534e (patch) | |
| tree | 670efe71fe7c04693fd27cb3c13acf28f446d5ea /mysql-test | |
| parent | 04ddb6122c3b0cdc40968cf618289628a465c53f (diff) | |
| parent | a37b15c6b013dcde0160bf0ff522e5a3422ba1f6 (diff) | |
| download | mariadb-git-0d12a95dde9f1d5267875e62ee201b0cefc4534e.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/t/system_mysql_db_fix.test | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/mysql-test/t/system_mysql_db_fix.test b/mysql-test/t/system_mysql_db_fix.test index 1122803fd8f..e34dbefbcba 100644 --- a/mysql-test/t/system_mysql_db_fix.test +++ b/mysql-test/t/system_mysql_db_fix.test @@ -9,6 +9,7 @@ use test; # create system tables as in mysql-3.20 +--disable_warnings CREATE TABLE db ( Host char(60) binary DEFAULT '' NOT NULL, Db char(32) binary DEFAULT '' NOT NULL, @@ -23,10 +24,12 @@ CREATE TABLE db ( KEY User (User) ) type=ISAM; +--enable-warnings INSERT INTO db VALUES ('%','test', '','Y','Y','Y','Y','Y','Y'); INSERT INTO db VALUES ('%','test\_%','','Y','Y','Y','Y','Y','Y'); +--disable_warnings CREATE TABLE host ( Host char(60) binary DEFAULT '' NOT NULL, Db char(32) binary DEFAULT '' NOT NULL, @@ -39,7 +42,9 @@ CREATE TABLE host ( PRIMARY KEY Host (Host,Db) ) type=ISAM; +--enable-warnings +--disable_warnings CREATE TABLE user ( Host char(60) binary DEFAULT '' NOT NULL, User char(16) binary DEFAULT '' NOT NULL, @@ -56,6 +61,7 @@ CREATE TABLE user ( PRIMARY KEY Host (Host,User) ) type=ISAM; +--enable-warnings INSERT INTO user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y'); INSERT INTO user VALUES ('localhost','', '','N','N','N','N','N','N','N','N','N'); |