diff options
| author | unknown <mats@mats-laptop.(none)> | 2008-03-28 14:52:33 +0100 |
|---|---|---|
| committer | unknown <mats@mats-laptop.(none)> | 2008-03-28 14:52:33 +0100 |
| commit | 2e12a17d17bacd3a5e976c8ea0eb6e25711ced17 (patch) | |
| tree | fba263faf91663961b68a5d5e020121eb494f12d /mysql-test/extra | |
| parent | 9d0385d62bfb439855ec8de027776ef847f47369 (diff) | |
| parent | f56d77dadf324d62f21e3fff7f460a8aba464605 (diff) | |
| download | mariadb-git-2e12a17d17bacd3a5e976c8ea0eb6e25711ced17.tar.gz | |
Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-bugteam
into mats-laptop.(none):/home/bk/b29020-mysql-5.1-rpl
mysql-test/suite/binlog/r/binlog_base64_flag.result:
Auto merged
mysql-test/suite/binlog/t/binlog_base64_flag.test:
Auto merged
mysql-test/suite/rpl/r/rpl_row_create_table.result:
Auto merged
sql/log.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/log_event.h:
Auto merged
sql/sql_insert.cc:
Auto merged
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; |