summaryrefslogtreecommitdiff
path: root/mysql-test/r/user_var-binlog.result
diff options
context:
space:
mode:
authorunknown <mats@romeo.(none)>2007-03-20 08:52:01 +0100
committerunknown <mats@romeo.(none)>2007-03-20 08:52:01 +0100
commita0e0166ba55f696e519d4073dea5fcdd8b74542d (patch)
tree9437ac9f923cab8ba004a03324632ce9fd0cde3d /mysql-test/r/user_var-binlog.result
parentc75e3d7e886cca41b97f9d74dc5b7cab2c144fc9 (diff)
downloadmariadb-git-a0e0166ba55f696e519d4073dea5fcdd8b74542d.tar.gz
BUG#22583: RBR between MyISAM and non-MyISAM tables containing a BIT
field does not work Fix to prevent MyISAM from reading data from NULL BLOB. Fix to make record comparison independent of values of unused bits in record. Updating binlog positions in tests. mysql-test/extra/rpl_tests/rpl_multi_query.test: Binlog position change mysql-test/extra/rpl_tests/rpl_stm_charset.test: Binlog position change mysql-test/include/show_binlog_events.inc: Binlog position change mysql-test/r/binlog_stm_binlog.result: Result change mysql-test/r/binlog_stm_ctype_ucs.result: Result change mysql-test/r/binlog_stm_insert_select.result: Result change mysql-test/r/binlog_stm_mix_innodb_myisam.result: Result change mysql-test/r/ctype_cp932_binlog_stm.result: Result change mysql-test/r/ndb_binlog_multi.result: Result change mysql-test/r/rpl_known_bugs_detection.result: Result change mysql-test/r/rpl_loaddata.result: Result change mysql-test/r/rpl_loaddata_s.result: Result change mysql-test/r/rpl_ndb_charset.result: Result change mysql-test/r/rpl_ndb_extraCol.result: Result change mysql-test/r/rpl_ndb_log.result: Result change mysql-test/r/rpl_ndb_multi.result: Result change mysql-test/r/rpl_rbr_to_sbr.result: Result change mysql-test/r/rpl_rotate_logs.result: Result change mysql-test/r/rpl_sp.result: Result change mysql-test/r/rpl_stm_charset.result: Result change mysql-test/r/rpl_stm_flsh_tbls.result: Result change mysql-test/r/rpl_stm_log.result: Result change mysql-test/r/rpl_stm_max_relay_size.result: Result change mysql-test/r/rpl_stm_multi_query.result: Result change mysql-test/r/rpl_stm_reset_slave.result: Result change mysql-test/r/rpl_stm_until.result: Result change mysql-test/r/rpl_truncate_7ndb.result: Result change mysql-test/r/user_var-binlog.result: Result change mysql-test/t/binlog_stm_mix_innodb_myisam.test: Binlog position change mysql-test/t/ctype_cp932_binlog_stm.test: Binlog position change mysql-test/t/mysqlbinlog.test: Binlog position change mysql-test/t/mysqlbinlog2.test: Binlog position change mysql-test/t/rpl_sp.test: Binlog position change mysql-test/t/rpl_stm_flsh_tbls.test: Binlog position change sql/log_event.cc: Emptying the record entirely since it appears MyISAM reads blob column data even when they are NULL. Adding code to set unused bits of the records before doing a comparison, and restoring the original values after. Setting the unused bits is necessary since NDB does not set them correctly, and resetting them afterwards is needed because MyISAM compares the record with the one located when updating or deleting it. mysql-test/r/rpl_row_basic_11bugs-master.opt: New BitKeeper file ``mysql-test/r/rpl_row_basic_11bugs-master.opt'' mysql-test/r/rpl_row_basic_11bugs-slave.opt: New BitKeeper file ``mysql-test/r/rpl_row_basic_11bugs-slave.opt''
Diffstat (limited to 'mysql-test/r/user_var-binlog.result')
-rw-r--r--mysql-test/r/user_var-binlog.result2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/user_var-binlog.result b/mysql-test/r/user_var-binlog.result
index 1c50289a85d..901d0718d0d 100644
--- a/mysql-test/r/user_var-binlog.result
+++ b/mysql-test/r/user_var-binlog.result
@@ -6,7 +6,7 @@ INSERT INTO t1 VALUES(@`a b`);
set @var1= "';aaa";
SET @var2=char(ascii('a'));
insert into t1 values (@var1),(@var2);
-show binlog events from 102;
+show binlog events from 105;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # User var 1 # @`a b`=_latin1 0x68656C6C6F COLLATE latin1_swedish_ci
master-bin.000001 # Query 1 # use `test`; INSERT INTO t1 VALUES(@`a b`)