diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-10-07 20:19:57 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-10-07 20:19:57 +0200 |
| commit | 033eed84905f39e34d418dd769b09d004ff25216 (patch) | |
| tree | 2e6e084db77f5c6cb980adea6754e69e7b9b98c5 /mysql-test/t/rpl_slave_status.test | |
| parent | a3a0510458f793fac55d9896f98f7b377d2b87b2 (diff) | |
| parent | 9e4e7023a2978612c243e4cbc755dbe0d32adb20 (diff) | |
| download | mariadb-git-033eed84905f39e34d418dd769b09d004ff25216.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
client/mysqltest.c:
Auto merged
mysql-test/t/rpl_slave_status.test:
Auto merged
mysql-test/t/system_mysql_db_fix.test:
Auto merged
Diffstat (limited to 'mysql-test/t/rpl_slave_status.test')
| -rw-r--r-- | mysql-test/t/rpl_slave_status.test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/rpl_slave_status.test b/mysql-test/t/rpl_slave_status.test index 985cebabe7e..b97b769d181 100644 --- a/mysql-test/t/rpl_slave_status.test +++ b/mysql-test/t/rpl_slave_status.test @@ -9,7 +9,7 @@ start slave; connection master; --disable_warnings drop table if exists t1; ---enable_warning +--enable_warnings create table t1 (n int); insert into t1 values (1); save_master_pos; |