Commit 55d25c98 authored by unknown's avatar unknown
Browse files

Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl 

into  romeo.(none):/home/bk/b20265-mysql-5.1-new-rpl


sql/sql_class.h:
  Auto merged
sql/log.cc:
  Manual merge
sql/sql_insert.cc:
  Manual merge
parents dc4418ed 4e46f2db

mysql-test/r/binlog_row_mix_innodb_myisam.result

+0 −18
Original line number Diff line number Diff line
@@ -359,15 +359,6 @@ show binlog events from 102; 
Log_name	Pos	Event_type	Server_id	End_log_pos	Info

master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)

master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F

master-bin.000001	#	Query	1	#	use `test`; BEGIN

master-bin.000001	#	Query	1	#	use `test`; CREATE TABLE `t2` (

  `a` int(11) NOT NULL DEFAULT '0',

  `b` int(11) DEFAULT NULL,

  PRIMARY KEY (`a`)

) ENGINE=InnoDB

master-bin.000001	#	Table_map	1	#	table_id: # (test.t2)

master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F

master-bin.000001	#	Xid	1	#	COMMIT /* xid= */

master-bin.000001	#	Query	1	#	use `test`; DROP TABLE if exists t2

master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)

master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
@@ -375,15 +366,6 @@ master-bin.000001 # Query 1 # use `test`; DROP TABLE IF EXISTS t2 
master-bin.000001	#	Query	1	#	use `test`; CREATE TABLE t2 (a int, b int, primary key (a)) engine=innodb

master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)

master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F

master-bin.000001	#	Query	1	#	use `test`; BEGIN

master-bin.000001	#	Query	1	#	use `test`; CREATE TABLE `t2` (

  `a` int(11) NOT NULL DEFAULT '0',

  `b` int(11) DEFAULT NULL,

  PRIMARY KEY (`a`)

) ENGINE=InnoDB

master-bin.000001	#	Table_map	1	#	table_id: # (test.t2)

master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F

master-bin.000001	#	Xid	1	#	COMMIT /* xid= */

master-bin.000001	#	Query	1	#	use `test`; TRUNCATE table t2

master-bin.000001	#	Xid	1	#	COMMIT /* xid= */

master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)

sql/log.cc

+405 −135

File changed.

Preview size limit exceeded, changes collapsed.

sql/sql_class.h

+1 −0
Original line number Diff line number Diff line
@@ -930,6 +930,7 @@ class THD :public Statement, 
  /*

    Public interface to write RBR events to the binlog

  */

  void binlog_start_trans_and_stmt();

  int binlog_write_table_map(TABLE *table, bool is_transactional);

  int binlog_write_row(TABLE* table, bool is_transactional,

                       MY_BITMAP const* cols, my_size_t colcnt,

sql/sql_insert.cc

+97 −53

File changed.

Preview size limit exceeded, changes collapsed.