diff options
| author | unknown <gkodinov/kgeorge@magare.gmz> | 2008-03-31 11:57:18 +0300 |
|---|---|---|
| committer | unknown <gkodinov/kgeorge@magare.gmz> | 2008-03-31 11:57:18 +0300 |
| commit | f07915534b2dc82693732ee86557f92cef8de438 (patch) | |
| tree | 4420a1a039bb96e9b7dc7d13253c4481680ab92d /mysql-test/extra | |
| parent | 3d3c7fbe35e7939a92cf52afe90093d4083429c1 (diff) | |
| parent | 3afa15b53cd928ae6579ae65be82307a7b8d1de3 (diff) | |
| download | mariadb-git-f07915534b2dc82693732ee86557f92cef8de438.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.1
into magare.gmz:/home/kgeorge/mysql/work/merge-build-5.1-bugteam
sql/log.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/share/errmsg.txt:
merged 5.1-main to 5.1-bugteam
Diffstat (limited to 'mysql-test/extra')
| -rw-r--r-- | mysql-test/extra/rpl_tests/rpl_row_delayed_ins.test | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mysql-test/extra/rpl_tests/rpl_row_delayed_ins.test b/mysql-test/extra/rpl_tests/rpl_row_delayed_ins.test index c4e6dbc84c2..214027160a9 100644 --- a/mysql-test/extra/rpl_tests/rpl_row_delayed_ins.test +++ b/mysql-test/extra/rpl_tests/rpl_row_delayed_ins.test @@ -15,7 +15,6 @@ SELECT * FROM t1 ORDER BY a; sync_slave_with_master; connection master; -source include/show_binlog_events.inc; sync_slave_with_master; SELECT * FROM t1 ORDER BY a; connection master; |