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

parent 9415b241
...@@ -415,19 +415,16 @@ master-bin.000001 # Query 1 # use `mysqltest1`; CREATE TABLE `t2` ( ...@@ -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 # Table_map 1 # table_id: # (mysqltest1.t2)
master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F 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` ( master-bin.000001 # Query 1 # use `mysqltest1`; CREATE TABLE `t3` (
`1` varbinary(108) NOT NULL DEFAULT '' `1` varbinary(108) NOT NULL DEFAULT ''
) )
master-bin.000001 # Table_map 1 # table_id: # (mysqltest1.t3) 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 # 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` ( master-bin.000001 # Query 1 # use `mysqltest1`; CREATE TABLE `t4` (
`a` varchar(100) DEFAULT NULL `a` varchar(100) DEFAULT NULL
) )
master-bin.000001 # Table_map 1 # table_id: # (mysqltest1.t4) 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 # 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 # 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 # Table_map 1 # table_id: # (mysqltest1.t5)
master-bin.000001 # Write_rows 1 # table_id: # master-bin.000001 # Write_rows 1 # table_id: #
......
...@@ -1201,6 +1201,7 @@ public: ...@@ -1201,6 +1201,7 @@ public:
*/ */
inline void force_one_auto_inc_interval(ulonglong next_id) 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); auto_inc_intervals_forced.append(next_id, ULONGLONG_MAX, 0);
} }
...@@ -1571,6 +1572,7 @@ public: ...@@ -1571,6 +1572,7 @@ public:
#else #else
current_stmt_binlog_row_based= FALSE; current_stmt_binlog_row_based= FALSE;
#endif #endif
}
/* /*
Initialize the current database from a NULL-terminated string with length Initialize the current database from a NULL-terminated string with length
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment