diff options
| author | unknown <jani@labbari.dsl.inet.fi> | 2007-07-07 23:17:35 +0300 |
|---|---|---|
| committer | unknown <jani@labbari.dsl.inet.fi> | 2007-07-07 23:17:35 +0300 |
| commit | 85510db991b5bbaa954bd181e1d02e45ca9f845f (patch) | |
| tree | 1c72ca43486fdb34e70e157c23e269e51acca621 | |
| parent | 81e32ad00bc76a08b63d68ad600e4a3db8caaee3 (diff) | |
| download | mariadb-git-85510db991b5bbaa954bd181e1d02e45ca9f845f.tar.gz | |
Merged from main 5.1
| -rw-r--r-- | mysql-test/r/alter_table.result | 2 | ||||
| -rw-r--r-- | mysql-test/r/rpl_events.result | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/mysql-test/r/alter_table.result b/mysql-test/r/alter_table.result index a9c01f308f7..cc93eab0cd5 100644 --- a/mysql-test/r/alter_table.result +++ b/mysql-test/r/alter_table.result @@ -1030,6 +1030,7 @@ select * from t2; c NULL 1 +Two Three lock table t2 write, t3 read; alter table t2 change c vc varchar(100) default "Four", rename to t1; @@ -1046,6 +1047,7 @@ select * from t1; vc NULL 1 +Two Three Four drop tables t1, t3; diff --git a/mysql-test/r/rpl_events.result b/mysql-test/r/rpl_events.result index 18fe72a9879..2cb9a4ab62f 100644 --- a/mysql-test/r/rpl_events.result +++ b/mysql-test/r/rpl_events.result @@ -122,13 +122,15 @@ SELECT * FROM t1 ORDER BY id; id c ts 1 manually TIMESTAMP 2 from justonce TIMESTAMP -affected rows: 2 +4 from er TIMESTAMP +affected rows: 3 "Checking event data on the slave" SELECT * FROM t1 ORDER BY id; id c ts 1 manually TIMESTAMP 2 from justonce TIMESTAMP -affected rows: 2 +4 from er TIMESTAMP +affected rows: 3 "Checking event is inactive on slave" SELECT db, name, status, originator FROM mysql.event WHERE db = 'test' AND name = 'justonce'; db name status originator |