diff options
| author | unknown <anozdrin/alik@alik.> | 2006-11-07 13:50:00 +0300 |
|---|---|---|
| committer | unknown <anozdrin/alik@alik.> | 2006-11-07 13:50:00 +0300 |
| commit | 871378bc697c59f87b99c64d243136948b1f9d6f (patch) | |
| tree | 42fb1db881900588ca6d4b0cce2a7d825736863a /mysql-test/t/system_mysql_db_fix.test | |
| parent | e5bd94b2d4fd6937a0f5ff53a295fe14a83ccaef (diff) | |
| parent | 024a1781a6310383c1e352d483e7a701d564d051 (diff) | |
| download | mariadb-git-871378bc697c59f87b99c64d243136948b1f9d6f.tar.gz | |
Merge alik.:/mnt/raid/alik/MySQL/devel/5.0
into alik.:/mnt/raid/alik/MySQL/devel/5.0-rt
configure.in:
Auto merged
include/my_time.h:
Auto merged
mysql-test/r/func_time.result:
Auto merged
mysql-test/r/rename.result:
Auto merged
mysql-test/t/func_time.test:
Auto merged
mysql-test/t/im_daemon_life_cycle.imtest:
Auto merged
mysql-test/t/rename.test:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql-common/my_time.c:
Auto merged
sql/time.cc:
Auto merged
Diffstat (limited to 'mysql-test/t/system_mysql_db_fix.test')
| -rw-r--r-- | mysql-test/t/system_mysql_db_fix.test | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/t/system_mysql_db_fix.test b/mysql-test/t/system_mysql_db_fix.test index fa44b454b4f..c50b641b7e2 100644 --- a/mysql-test/t/system_mysql_db_fix.test +++ b/mysql-test/t/system_mysql_db_fix.test @@ -38,7 +38,7 @@ CREATE TABLE db ( KEY User (User) ) type=ISAM; ---enable-warnings +--enable_warnings INSERT INTO db VALUES ('%','test', '','Y','Y','Y','Y','Y','Y'); INSERT INTO db VALUES ('%','test\_%','','Y','Y','Y','Y','Y','Y'); @@ -56,7 +56,7 @@ CREATE TABLE host ( PRIMARY KEY Host (Host,Db) ) type=ISAM; ---enable-warnings +--enable_warnings --disable_warnings CREATE TABLE user ( @@ -75,7 +75,7 @@ CREATE TABLE user ( PRIMARY KEY Host (Host,User) ) type=ISAM; ---enable-warnings +--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'); |