Skip to content

M
mariadb
Commit 04f19137 authored by tomas@whalegate.ndb.mysql.com's avatar tomas@whalegate.ndb.mysql.com
Browse files
Options

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb 

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl
parents 6a51e0f8 a67e7555
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 0 deletions
mysql-test/include/ndb_not_readonly.inc
View file @ 04f19137
...@@ -3,6 +3,8 @@ ...@@ -3,6 +3,8 @@
# wait for server to connect properly to cluster # wait for server to connect properly to cluster
# #
--error 0,ER_NO_SUCH_TABLE,ER_OPEN_AS_READONLY,ER_GET_ERRMSG,ER_KEY_NOT_FOUND --error 0,ER_NO_SUCH_TABLE,ER_OPEN_AS_READONLY,ER_GET_ERRMSG,ER_KEY_NOT_FOUND
set @saved_log = @@sql_log_bin;
set sql_log_bin = 0;
delete from mysql.ndb_apply_status where server_id=0; delete from mysql.ndb_apply_status where server_id=0;
let $mysql_errno= 1; let $mysql_errno= 1;
let $counter= 600; let $counter= 600;
...@@ -22,6 +24,7 @@ while ($mysql_errno) ...@@ -22,6 +24,7 @@ while ($mysql_errno)
} }
} }
delete from mysql.ndb_apply_status where server_id=0; delete from mysql.ndb_apply_status where server_id=0;
set sql_log_bin = @saved_log;
# #
# connected # connected
# #
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7