summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHe Zhenxing <zhenxing.he@sun.com>2009-12-21 14:14:45 +0800
committerHe Zhenxing <zhenxing.he@sun.com>2009-12-21 14:14:45 +0800
commitd332a1895282aa7b3786b8116ad89d93db8ddd6a (patch)
treeb10a444b3b0d62263c3c2c692c2b5510cc647841
parentff6c429612b8a4250f9b6a28a4e5660f44a1480b (diff)
downloadmariadb-git-d332a1895282aa7b3786b8116ad89d93db8ddd6a.tar.gz
Bug#47638 The rpl_killed_ddl test fails on Windows
When the $diff_statement variable for diff_master_slave.inc was put in multiple lines, the rear part of the statement would be missing when being executed on Windows systems. Fixed the problem by always putting the value for $diff_statement in one line.
-rw-r--r--mysql-test/suite/rpl/t/rpl_killed_ddl.test3
1 files changed, 1 insertions, 2 deletions
diff --git a/mysql-test/suite/rpl/t/rpl_killed_ddl.test b/mysql-test/suite/rpl/t/rpl_killed_ddl.test
index 0f2fe5b60fb..61b882efcf3 100644
--- a/mysql-test/suite/rpl/t/rpl_killed_ddl.test
+++ b/mysql-test/suite/rpl/t/rpl_killed_ddl.test
@@ -158,8 +158,7 @@ source include/kill_query_and_diff_master_slave.inc;
######## EVENT ########
-let $diff_statement= SELECT event_name, event_body, execute_at
- FROM information_schema.events where event_name like 'e%';
+let $diff_statement= SELECT event_name, event_body, execute_at FROM information_schema.events where event_name like 'e%';
send CREATE EVENT e2
ON SCHEDULE AT CURRENT_TIMESTAMP + INTERVAL 1 DAY