diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-10-24 17:55:39 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-10-24 17:55:39 +0200 |
| commit | 7a1458ccb5504737451720d4769e475f6b071dc5 (patch) | |
| tree | f5021faee5715541b76ede2bd508ab938c0bc7c5 /mysql-test/t/rpl_trigger.test | |
| parent | bd6a8cb3cb73dcd7d53478e1614ba33d1bf71452 (diff) | |
| parent | 1023e010587c63e3a7fb04b3dea804de5e556468 (diff) | |
| download | mariadb-git-7a1458ccb5504737451720d4769e475f6b071dc5.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
mysql-test/r/mysqldump-max.result:
Auto merged
mysql-test/r/rpl_trigger.result:
Auto merged
mysql-test/r/type_newdecimal.result:
Auto merged
mysql-test/t/rpl_trigger.test:
Auto merged
mysql-test/t/type_newdecimal.test:
Auto merged
Diffstat (limited to 'mysql-test/t/rpl_trigger.test')
| -rw-r--r-- | mysql-test/t/rpl_trigger.test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/rpl_trigger.test b/mysql-test/t/rpl_trigger.test index 279574a8aaa..6ec0021635a 100644 --- a/mysql-test/t/rpl_trigger.test +++ b/mysql-test/t/rpl_trigger.test @@ -70,7 +70,7 @@ select get_lock("bug12480",2); connection default; create table t1 (a datetime,b datetime, c datetime); ---ignore_warnings +--disable_warnings drop function if exists bug12480; --enable_warnings |