mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1
into zim.(none):/home/brian/mysql/merge-5.1 sql/mysql_priv.h: Auto merged
This commit is contained in:
4
mysql-test/include/have_binlog_format_mixed.inc
Normal file
4
mysql-test/include/have_binlog_format_mixed.inc
Normal file
@ -0,0 +1,4 @@
|
||||
-- require r/have_binlog_format_mixed.require
|
||||
disable_query_log;
|
||||
show variables like "binlog_format";
|
||||
enable_query_log;
|
@ -0,0 +1,5 @@
|
||||
--require r/have_binlog_format_statement.require
|
||||
--disable_query_log
|
||||
--replace_result MIXED STATEMENT
|
||||
show variables like "binlog_format";
|
||||
--enable_query_log
|
@ -28,7 +28,6 @@ INSERT INTO t1 VALUES(412,1,'Testing MySQL databases is a cool ',
|
||||
select id,hex(b1),vc,bc,d,f,total,y,t from t1 order by id;
|
||||
|
||||
sync_slave_with_master;
|
||||
--sleep 5
|
||||
--echo --- Select from t1 on slave ---
|
||||
select id,hex(b1),vc,bc,d,f,total,y,t from t1 order by id;
|
||||
|
||||
@ -44,7 +43,6 @@ SELECT id,hex(b1),vc,bc,d,f,total,y,t FROM t1 WHERE id = 412;
|
||||
# into the binlog other wise we will miss the update.
|
||||
|
||||
sync_slave_with_master;
|
||||
--sleep 5
|
||||
--echo --- Check Update on slave ---
|
||||
SELECT id,hex(b1),vc,bc,d,f,total,y,t FROM t1 WHERE id = 412;
|
||||
|
||||
@ -56,7 +54,6 @@ DELETE FROM t1 WHERE id = 42;
|
||||
SELECT COUNT(*) FROM t1;
|
||||
|
||||
sync_slave_with_master;
|
||||
--sleep 5
|
||||
--echo --- Show current count on slave for t1 ---
|
||||
SELECT COUNT(*) FROM t1;
|
||||
|
||||
|
23
mysql-test/include/safe_set_to_maybe_ro_var.inc
Normal file
23
mysql-test/include/safe_set_to_maybe_ro_var.inc
Normal file
@ -0,0 +1,23 @@
|
||||
# to mask out the error - never abort neither log in result file - in setting
|
||||
# to read-only variable.
|
||||
# It is assumed that the new value is equal to one the var was set to.
|
||||
# Such situation happens particularily with binlog_format that becomes read-only
|
||||
# with ndb default storage.
|
||||
#
|
||||
# when generate results always watch the file to find what is expected,
|
||||
# the SET query may fail
|
||||
|
||||
# script accepts $maybe_ro_var the var name and $val4var the value
|
||||
|
||||
### USAGE:
|
||||
### let $maybe_ro_var= ...
|
||||
### let $val4var= ...
|
||||
### include/safe_set_to_maybe_ro_var.inc
|
||||
|
||||
--disable_result_log
|
||||
--disable_abort_on_error
|
||||
eval SET $maybe_ro_var = $val4var;
|
||||
--enable_abort_on_error
|
||||
--enable_result_log
|
||||
|
||||
eval SELECT $maybe_ro_var;
|
Reference in New Issue
Block a user