summaryrefslogtreecommitdiff
path: root/mysql-test/r/user_var-binlog.result
diff options
context:
space:
mode:
authorunknown <mats@romeo.(none)>2007-03-30 04:44:49 +0200
committerunknown <mats@romeo.(none)>2007-03-30 04:44:49 +0200
commitc4bab45b961de59c367784393313b03169f66e81 (patch)
tree5dcec528f581df4ea0dca190551d615be40cfb6f /mysql-test/r/user_var-binlog.result
parent85f7c6776b0f2da322bacf07b878db3fdd453d83 (diff)
downloadmariadb-git-c4bab45b961de59c367784393313b03169f66e81.tar.gz
Post merge fixes of result files.
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/ctype_cp932_binlog_stm.result: Result change. mysql-test/r/flush_block_commit_notembedded.result: Result change. mysql-test/r/rpl_000015.result: Result change. mysql-test/r/rpl_change_master.result: Result change. mysql-test/r/rpl_deadlock_innodb.result: Result change. mysql-test/r/rpl_flushlog_loop.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_log_pos.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_row_max_relay_size.result: Result change. mysql-test/r/rpl_server_id1.result: Result change. mysql-test/r/rpl_server_id2.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_switch_stm_row_mixed.result: Result change. mysql-test/r/rpl_truncate_2myisam.result: Result change. mysql-test/r/rpl_truncate_3innodb.result: Result change. mysql-test/r/rpl_truncate_7ndb.result: Result change. mysql-test/r/user_var-binlog.result: Result change.
Diffstat (limited to 'mysql-test/r/user_var-binlog.result')
-rw-r--r--mysql-test/r/user_var-binlog.result12
1 files changed, 6 insertions, 6 deletions
diff --git a/mysql-test/r/user_var-binlog.result b/mysql-test/r/user_var-binlog.result
index 901d0718d0d..b76b399c9e2 100644
--- a/mysql-test/r/user_var-binlog.result
+++ b/mysql-test/r/user_var-binlog.result
@@ -6,13 +6,13 @@ INSERT INTO t1 VALUES(@`a b`);
set @var1= "';aaa";
SET @var2=char(ascii('a'));
insert into t1 values (@var1),(@var2);
-show binlog events from 105;
+show binlog events from <binlog_start>;
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`)
-master-bin.000001 # User var 1 # @`var1`=_latin1 0x273B616161 COLLATE latin1_swedish_ci
-master-bin.000001 # User var 1 # @`var2`=_binary 0x61 COLLATE binary
-master-bin.000001 # Query 1 # use `test`; insert into t1 values (@var1),(@var2)
+master-bin.000001 # User var # # @`a b`=_latin1 0x68656C6C6F COLLATE latin1_swedish_ci
+master-bin.000001 # Query # # use `test`; INSERT INTO t1 VALUES(@`a b`)
+master-bin.000001 # User var # # @`var1`=_latin1 0x273B616161 COLLATE latin1_swedish_ci
+master-bin.000001 # User var # # @`var2`=_binary 0x61 COLLATE binary
+master-bin.000001 # Query # # use `test`; insert into t1 values (@var1),(@var2)
flush logs;
/*!40019 SET @@session.max_insert_delayed_threads=0*/;
/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;