bk commit into 5.1 tree (mkindahl:1.2250)

[Mats Kindahl]

Below is the list of changes that have just been committed into a local
5.1 repository of mkindahl. When mkindahl does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-07-12 08:52:47+02:00, mkindahl@stripped +2 -0
  Post-merge fixes for mysql-5.1-new-rpl

  mysql-test/r/rpl_switch_stm_row_mixed.result@stripped, 2006-07-12 08:52:42+02:00, mkindahl@stripped +0 -3
    Result change

  sql/sql_class.h@stripped, 2006-07-12 08:52:42+02:00, mkindahl@stripped +2 -0
    Post-merge fixes.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	mkindahl
# Host:	dl145k.mysql.com
# Root:	/data0/mkindahl/bk/MERGE/mysql-5.1-merge

--- 1.309/sql/sql_class.h	2006-07-12 08:52:56 +02:00
+++ 1.310/sql/sql_class.h	2006-07-12 08:52:56 +02:00
@@ -1201,6 +1201,7 @@
   */
   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 @@
 #else
     current_stmt_binlog_row_based= FALSE;
 #endif
+  }
 
   /*
     Initialize the current database from a NULL-terminated string with length

--- 1.11/mysql-test/r/rpl_switch_stm_row_mixed.result	2006-07-12 08:52:56 +02:00
+++ 1.12/mysql-test/r/rpl_switch_stm_row_mixed.result	2006-07-12 08:52:56 +02:00
@@ -415,19 +415,16 @@
 )
 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: #