Commit c5e1fb67 authored by Vladislav Vaintroub's avatar Vladislav Vaintroub

Fix several buildot errors on Windows

- do not attempt loading federatedx dynamically - does not work on Windows embedded
- race condition in rpl_start_stop_slave
- fix exclusion rule to catch warning in partition test
parent d110e037
...@@ -4693,7 +4693,7 @@ sub extract_warning_lines ($$) { ...@@ -4693,7 +4693,7 @@ sub extract_warning_lines ($$) {
qr/error .*connecting to master/, qr/error .*connecting to master/,
qr/Plugin 'ndbcluster' will be forced to shutdown/, qr/Plugin 'ndbcluster' will be forced to shutdown/,
qr/InnoDB: Error: in ALTER TABLE `test`.`t[12]`/, qr/InnoDB: Error: in ALTER TABLE `test`.`t[12]`/,
qr/InnoDB: Error: table `test`.`t[12]` does not exist in the InnoDB internal/, qr/InnoDB: Error: table `test`.`t[12]` .*does not exist in the InnoDB internal/,
qr/InnoDB: Warning: a long semaphore wait:/, qr/InnoDB: Warning: a long semaphore wait:/,
qr/Slave: Unknown table 't1' Error_code: 1051/, qr/Slave: Unknown table 't1' Error_code: 1051/,
qr/Slave SQL:.*(Error_code: [[:digit:]]+|Query:.*)/, qr/Slave SQL:.*(Error_code: [[:digit:]]+|Query:.*)/,
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
# 2008-01-23 mleich WL#4203 Reorganize and fix the data dictionary tests of # 2008-01-23 mleich WL#4203 Reorganize and fix the data dictionary tests of
# testsuite funcs_1 # testsuite funcs_1
# #
--source include/not_embedded.inc # loading engines not generally possible in embedded
let $engine_type= FEDERATED; let $engine_type= FEDERATED;
--source suite/federated/have_federatedx.inc --source suite/federated/have_federatedx.inc
--vertical_results --vertical_results
......
...@@ -7,4 +7,5 @@ kill <connection_id>; ...@@ -7,4 +7,5 @@ kill <connection_id>;
set @time_after_kill := (select CURRENT_TIMESTAMP); set @time_after_kill := (select CURRENT_TIMESTAMP);
[Time after the query] [Time after the query]
[Killing of the slave IO thread was successful] [Killing of the slave IO thread was successful]
START SLAVE IO_THREAD;
include/rpl_end.inc include/rpl_end.inc
...@@ -40,5 +40,8 @@ if(`select TIMESTAMPDIFF(SECOND,@time_after_kill, @time_before_kill) > 60`) ...@@ -40,5 +40,8 @@ if(`select TIMESTAMPDIFF(SECOND,@time_after_kill, @time_before_kill) > 60`)
} }
--echo [Killing of the slave IO thread was successful] --echo [Killing of the slave IO thread was successful]
--disable_warnings
START SLAVE IO_THREAD;
--enable_warnings
# End of test # End of test
--source include/rpl_end.inc --source include/rpl_end.inc
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment