Commit 9a111f5c authored by unknown's avatar unknown
Browse files

Post-merge fixes for mysql-5.1-new-rpl 


mysql-test/r/rpl_switch_stm_row_mixed.result:
  Result change
sql/sql_class.h:
  Post-merge fixes.
parent c22a8981

mysql-test/r/rpl_switch_stm_row_mixed.result

+0 −3
Original line number Diff line number Diff line
@@ -415,19 +415,16 @@ master-bin.000001 # Query 1 # use `mysqltest1`; CREATE TABLE `t2` ( 
)

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

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

master-bin.000001	#	Query	1	#	use `mysqltest1`; COMMIT

master-bin.000001	#	Query	1	#	use `mysqltest1`; CREATE TABLE `t3` (

  `1` varbinary(108) NOT NULL DEFAULT ''

)

master-bin.000001	#	Table_map	1	#	table_id: # (mysqltest1.t3)

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

master-bin.000001	#	Query	1	#	use `mysqltest1`; COMMIT

master-bin.000001	#	Query	1	#	use `mysqltest1`; CREATE TABLE `t4` (

  `a` varchar(100) DEFAULT NULL

)

master-bin.000001	#	Table_map	1	#	table_id: # (mysqltest1.t4)

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

master-bin.000001	#	Query	1	#	use `mysqltest1`; COMMIT

master-bin.000001	#	Query	1	#	use `mysqltest1`; create table t5 select * from t1 where 3 in (select 1 union select 2 union select curdate() union select 3)

master-bin.000001	#	Table_map	1	#	table_id: # (mysqltest1.t5)

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

sql/sql_class.h

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

  inline void force_one_auto_inc_interval(ulonglong next_id)

  {

    auto_inc_intervals_forced.empty(); // in case of multiple SET INSERT_ID

    auto_inc_intervals_forced.append(next_id, ULONGLONG_MAX, 0);

  }
@@ -1571,6 +1572,7 @@ class THD :public Statement, 
#else

    current_stmt_binlog_row_based= FALSE;

#endif

  }



  /*

    Initialize the current database from a NULL-terminated string with length