Added options --auto-increment-increment and --auto-increment-offset.

This allows one to setup a master <-> master replication with non conflicting auto-increment series.
Cleaned up binary log code to make it easyer to add new state variables.
Added simpler 'upper level' logic for artificial events (events that should not cause cleanups on slave).
Simplified binary log handling.
Changed how auto_increment works together with to SET INSERT_ID=# to make it more predictable: Now the inserted rows in a multi-row statement are set independent of the existing rows in the table. (Before only InnoDB did this correctly)




mysql-test/r/mix_innodb_myisam_binlog.result:
  Disable End_log_pos column from 'show binlog events' as this is now different from before
mysql-test/t/mix_innodb_myisam_binlog.test:
  Disable End_log_pos column from 'show binlog events' as this is now different from before
sql/ha_berkeley.cc:
  Changed prototype for get_auto_increment()
sql/ha_berkeley.h:
  Changed prototype for get_auto_increment()
sql/ha_heap.cc:
  Changed prototype for get_auto_increment()
sql/ha_heap.h:
  Changed prototype for get_auto_increment()
sql/ha_innodb.cc:
  Change how auto-increment is calculated.
  Now the auto-increment logic is done in 'update_auto_increment()' to ensure that all handlers has the same auto-increment usage
sql/ha_innodb.h:
  Changed prototype for get_auto_increment()
sql/ha_myisam.cc:
  Changed prototype for get_auto_increment()
sql/ha_myisam.h:
  Changed prototype for get_auto_increment()
sql/ha_ndbcluster.cc:
  Changed prototype for get_auto_increment()
sql/ha_ndbcluster.h:
  Changed prototype for get_auto_increment()
sql/handler.cc:
  Remove some usage of current_thd
  Changed how auto_increment works with SET INSERT_ID to make it more predictable
  (Now we should generate same auto-increment serie on a slave, even if the table has rows that was not on the master.
  Use auto_increment_increment and auto_increment_offset
sql/handler.h:
  Changed prototype for get_auto_increment()
sql/log.cc:
  Remove usage of 'set_log_pos()' to make code simpler. (Now log_pos is set in write_header())
  Use 'data_written' instead of 'get_event_len()' to calculate how much data was written in the log
sql/log_event.cc:
  Simple optimizations.
  Remove cached_event_len (not used variable)
  Made comments fit into 79 chars
  Removed Log_event::set_log_pos(). Now we calculate log_pos in write_header().
  Renamed write_data() to write() as the original write() function was not needed anymore.
  Call writing of event header from event::write() functions. This made it easier to calculate the length of an event.
  Simplified 'write_header' and remove 'switches' from it.
  Changed all write() functions to return 'bool'. (The previous return values where not consistent)
  Store auto_increment_increment and auto_increment_offset in binary log
  Simplified how Query_log_event's where written and read. Now it's much easier to add now status variables for a query event to the binary log.
  Removed some old MySQL 4.x code to make it easier to grep for functions used in 5.0
sql/log_event.h:
  Changed return type of write() functions to bool. (Before we returned -1 or 1 for errors)
  write_data() -> write()
  Added 'data_written' member to make it easier to get length of written event.
  Removed 'cached_event_len' and 'get_event_len()'
  Added usage of auto_increment_increment and auto_increment_offset
  Added 'artifical_event' to Start_log_event_v3, to hide logic that we in the binary log use log_pos=0 as a flag for an artifical event.
sql/mysqld.cc:
  Added options --auto-increment-increment and --auto-increment-offset
sql/set_var.cc:
  Added variables auto_increment_increment and auto_increment_offset
sql/slave.cc:
  Changed errors -> warnings & information (in error log)
sql/sql_class.cc:
  Added THD::cleanup_after_query(). This makes some code simpler and allows us to clean up 'next_insert_id' after query
sql/sql_class.h:
  Added new auto_increment_xxx variables
  Moved some functions/variables in THD class
sql/sql_help.cc:
  Removed compiler warning
sql/sql_insert.cc:
  Call 'restore_auto_increment()' if row was not inserted.
  This makes it easier for handler to reuse the last generated auto-incrment value that was not used (for example in case of duplicate key)
sql/sql_parse.cc:
  Use cleanup_after_query()
sql/sql_prepare.cc:
  Use cleanup_after_query()
sql/sql_table.cc:
  R

5 files changed, 349 insertions, 47 deletions

diff --git a/mysql-test/r/mix_innodb_myisam_binlog.result b/mysql-test/r/mix_innodb_myisam_binlog.result
index 29154dc469c..11bc9772276 100644
--- a/mysql-test/r/mix_innodb_myisam_binlog.result
+++ b/mysql-test/r/mix_innodb_myisam_binlog.result
@@ -8,10 +8,10 @@ insert into t2 select * from t1;
 commit;
 show binlog events from 95;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	95	Query	1	157	use `test`; BEGIN
-master-bin.000001	157	Query	1	176	use `test`; insert into t1 values(1)
-master-bin.000001	238	Query	1	183	use `test`; insert into t2 select * from t1
-master-bin.000001	326	Query	1	389	use `test`; COMMIT
+master-bin.000001	95	Query	1	#	use `test`; BEGIN
+master-bin.000001	157	Query	1	#	use `test`; insert into t1 values(1)
+master-bin.000001	238	Query	1	#	use `test`; insert into t2 select * from t1
+master-bin.000001	326	Query	1	#	use `test`; COMMIT
 delete from t1;
 delete from t2;
 reset master;
@@ -23,10 +23,10 @@ Warnings:
 Warning	1196	Some non-transactional changed tables couldn't be rolled back
 show binlog events from 95;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	95	Query	1	157	use `test`; BEGIN
-master-bin.000001	157	Query	1	176	use `test`; insert into t1 values(2)
-master-bin.000001	238	Query	1	183	use `test`; insert into t2 select * from t1
-master-bin.000001	326	Query	1	391	use `test`; ROLLBACK
+master-bin.000001	95	Query	1	#	use `test`; BEGIN
+master-bin.000001	157	Query	1	#	use `test`; insert into t1 values(2)
+master-bin.000001	238	Query	1	#	use `test`; insert into t2 select * from t1
+master-bin.000001	326	Query	1	#	use `test`; ROLLBACK
 delete from t1;
 delete from t2;
 reset master;
@@ -41,13 +41,13 @@ Warning	1196	Some non-transactional changed tables couldn't be rolled back
 commit;
 show binlog events from 95;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	95	Query	1	157	use `test`; BEGIN
-master-bin.000001	157	Query	1	176	use `test`; insert into t1 values(3)
-master-bin.000001	238	Query	1	174	use `test`; savepoint my_savepoint
-master-bin.000001	317	Query	1	176	use `test`; insert into t1 values(4)
-master-bin.000001	398	Query	1	183	use `test`; insert into t2 select * from t1
-master-bin.000001	486	Query	1	186	use `test`; rollback to savepoint my_savepoint
-master-bin.000001	577	Query	1	640	use `test`; COMMIT
+master-bin.000001	95	Query	1	#	use `test`; BEGIN
+master-bin.000001	157	Query	1	#	use `test`; insert into t1 values(3)
+master-bin.000001	238	Query	1	#	use `test`; savepoint my_savepoint
+master-bin.000001	317	Query	1	#	use `test`; insert into t1 values(4)
+master-bin.000001	398	Query	1	#	use `test`; insert into t2 select * from t1
+master-bin.000001	486	Query	1	#	use `test`; rollback to savepoint my_savepoint
+master-bin.000001	577	Query	1	#	use `test`; COMMIT
 delete from t1;
 delete from t2;
 reset master;
@@ -67,14 +67,14 @@ a
 7
 show binlog events from 95;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	95	Query	1	157	use `test`; BEGIN
-master-bin.000001	157	Query	1	176	use `test`; insert into t1 values(5)
-master-bin.000001	238	Query	1	174	use `test`; savepoint my_savepoint
-master-bin.000001	317	Query	1	176	use `test`; insert into t1 values(6)
-master-bin.000001	398	Query	1	183	use `test`; insert into t2 select * from t1
-master-bin.000001	486	Query	1	186	use `test`; rollback to savepoint my_savepoint
-master-bin.000001	577	Query	1	176	use `test`; insert into t1 values(7)
-master-bin.000001	658	Query	1	721	use `test`; COMMIT
+master-bin.000001	95	Query	1	#	use `test`; BEGIN
+master-bin.000001	157	Query	1	#	use `test`; insert into t1 values(5)
+master-bin.000001	238	Query	1	#	use `test`; savepoint my_savepoint
+master-bin.000001	317	Query	1	#	use `test`; insert into t1 values(6)
+master-bin.000001	398	Query	1	#	use `test`; insert into t2 select * from t1
+master-bin.000001	486	Query	1	#	use `test`; rollback to savepoint my_savepoint
+master-bin.000001	577	Query	1	#	use `test`; insert into t1 values(7)
+master-bin.000001	658	Query	1	#	use `test`; COMMIT
 delete from t1;
 delete from t2;
 reset master;
@@ -89,10 +89,10 @@ get_lock("a",10)
 1
 show binlog events from 95;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	95	Query	1	157	use `test`; BEGIN
-master-bin.000001	157	Query	1	176	use `test`; insert into t1 values(8)
-master-bin.000001	238	Query	1	183	use `test`; insert into t2 select * from t1
-master-bin.000001	326	Query	1	391	use `test`; ROLLBACK
+master-bin.000001	95	Query	1	#	use `test`; BEGIN
+master-bin.000001	157	Query	1	#	use `test`; insert into t1 values(8)
+master-bin.000001	238	Query	1	#	use `test`; insert into t2 select * from t1
+master-bin.000001	326	Query	1	#	use `test`; ROLLBACK
 delete from t1;
 delete from t2;
 reset master;
@@ -100,8 +100,8 @@ insert into t1 values(9);
 insert into t2 select * from t1;
 show binlog events from 95;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	95	Query	1	176	use `test`; insert into t1 values(9)
-master-bin.000001	176	Query	1	264	use `test`; insert into t2 select * from t1
+master-bin.000001	95	Query	1	#	use `test`; insert into t1 values(9)
+master-bin.000001	176	Query	1	#	use `test`; insert into t2 select * from t1
 delete from t1;
 delete from t2;
 reset master;
@@ -110,17 +110,17 @@ begin;
 insert into t2 select * from t1;
 show binlog events from 95;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	95	Query	1	177	use `test`; insert into t1 values(10)
-master-bin.000001	177	Query	1	265	use `test`; insert into t2 select * from t1
+master-bin.000001	95	Query	1	#	use `test`; insert into t1 values(10)
+master-bin.000001	177	Query	1	#	use `test`; insert into t2 select * from t1
 insert into t1 values(11);
 commit;
 show binlog events from 95;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	95	Query	1	177	use `test`; insert into t1 values(10)
-master-bin.000001	177	Query	1	265	use `test`; insert into t2 select * from t1
-master-bin.000001	265	Query	1	327	use `test`; BEGIN
-master-bin.000001	327	Query	1	347	use `test`; insert into t1 values(11)
-master-bin.000001	409	Query	1	472	use `test`; COMMIT
+master-bin.000001	95	Query	1	#	use `test`; insert into t1 values(10)
+master-bin.000001	177	Query	1	#	use `test`; insert into t2 select * from t1
+master-bin.000001	265	Query	1	#	use `test`; BEGIN
+master-bin.000001	327	Query	1	#	use `test`; insert into t1 values(11)
+master-bin.000001	409	Query	1	#	use `test`; COMMIT
 alter table t2 engine=INNODB;
 delete from t1;
 delete from t2;
@@ -131,10 +131,10 @@ insert into t2 select * from t1;
 commit;
 show binlog events from 95;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	95	Query	1	157	use `test`; BEGIN
-master-bin.000001	157	Query	1	177	use `test`; insert into t1 values(12)
-master-bin.000001	239	Query	1	183	use `test`; insert into t2 select * from t1
-master-bin.000001	327	Query	1	390	use `test`; COMMIT
+master-bin.000001	95	Query	1	#	use `test`; BEGIN
+master-bin.000001	157	Query	1	#	use `test`; insert into t1 values(12)
+master-bin.000001	239	Query	1	#	use `test`; insert into t2 select * from t1
+master-bin.000001	327	Query	1	#	use `test`; COMMIT
 delete from t1;
 delete from t2;
 reset master;
@@ -156,9 +156,9 @@ rollback to savepoint my_savepoint;
 commit;
 show binlog events from 95;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	95	Query	1	157	use `test`; BEGIN
-master-bin.000001	157	Query	1	177	use `test`; insert into t1 values(14)
-master-bin.000001	239	Query	1	302	use `test`; COMMIT
+master-bin.000001	95	Query	1	#	use `test`; BEGIN
+master-bin.000001	157	Query	1	#	use `test`; insert into t1 values(14)
+master-bin.000001	239	Query	1	#	use `test`; COMMIT
 delete from t1;
 delete from t2;
 reset master;
@@ -176,8 +176,8 @@ a
 18
 show binlog events from 95;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	95	Query	1	157	use `test`; BEGIN
-master-bin.000001	157	Query	1	177	use `test`; insert into t1 values(16)
-master-bin.000001	239	Query	1	177	use `test`; insert into t1 values(18)
-master-bin.000001	321	Query	1	384	use `test`; COMMIT
+master-bin.000001	95	Query	1	#	use `test`; BEGIN
+master-bin.000001	157	Query	1	#	use `test`; insert into t1 values(16)
+master-bin.000001	239	Query	1	#	use `test`; insert into t1 values(18)
+master-bin.000001	321	Query	1	#	use `test`; COMMIT
 drop table t1,t2;
diff --git a/mysql-test/r/rpl_auto_increment.result b/mysql-test/r/rpl_auto_increment.result
new file mode 100644
index 00000000000..4a925163060
--- /dev/null
+++ b/mysql-test/r/rpl_auto_increment.result
@@ -0,0 +1,185 @@
+stop slave;
+drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
+reset master;
+reset slave;
+drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
+start slave;
+create table t1 (a int not null auto_increment,b int, primary key (a)) engine=myisam auto_increment=3;
+insert into t1 values (NULL,1),(NULL,2),(NULL,3);
+select * from t1;
+a	b
+12	1
+22	2
+32	3
+select * from t1;
+a	b
+12	1
+22	2
+32	3
+drop table t1;
+create table t1 (a int not null auto_increment,b int, primary key (a)) engine=myisam;
+insert into t1 values (1,1),(NULL,2),(3,3),(NULL,4);
+delete from t1 where b=4;
+insert into t1 values (NULL,5),(NULL,6);
+select * from t1;
+a	b
+1	1
+2	2
+3	3
+22	5
+32	6
+select * from t1;
+a	b
+1	1
+2	2
+3	3
+22	5
+32	6
+drop table t1;
+set @@session.auto_increment_increment=100, @@session.auto_increment_offset=10;
+show variables like "%auto%";
+Variable_name	Value
+auto_incrememt_increment	100
+auto_increment_offset	10
+create table t1 (a int not null auto_increment, primary key (a)) engine=myisam;
+insert into t1 values (NULL),(5),(NULL);
+insert into t1 values (250),(NULL);
+select * from t1;
+a
+5
+10
+110
+250
+310
+insert into t1 values (1000);
+set @@insert_id=400;
+insert into t1 values(NULL),(NULL);
+select * from t1;
+a
+5
+10
+110
+250
+310
+400
+410
+1000
+select * from t1;
+a
+5
+10
+110
+250
+310
+400
+410
+1000
+drop table t1;
+create table t1 (a int not null auto_increment, primary key (a)) engine=innodb;
+insert into t1 values (NULL),(5),(NULL);
+insert into t1 values (250),(NULL);
+select * from t1;
+a
+5
+10
+110
+250
+310
+insert into t1 values (1000);
+set @@insert_id=400;
+insert into t1 values(NULL),(NULL);
+select * from t1;
+a
+5
+10
+110
+250
+310
+400
+410
+1000
+select * from t1;
+a
+5
+10
+110
+250
+310
+400
+410
+1000
+drop table t1;
+set @@session.auto_increment_increment=1, @@session.auto_increment_offset=1;
+create table t1 (a int not null auto_increment, primary key (a)) engine=myisam;
+insert into t1 values (NULL),(5),(NULL),(NULL);
+insert into t1 values (500),(NULL),(502),(NULL),(NULL);
+select * from t1;
+a
+1
+5
+6
+7
+500
+501
+502
+503
+504
+set @@insert_id=600;
+insert into t1 values(600),(NULL),(NULL);
+ERROR 23000: Duplicate entry '600' for key 1
+set @@insert_id=600;
+insert ignore into t1 values(600),(NULL),(NULL),(610),(NULL);
+select * from t1;
+a
+1
+5
+6
+7
+500
+501
+502
+503
+504
+600
+610
+611
+select * from t1;
+a
+1
+5
+6
+7
+500
+501
+502
+503
+504
+600
+610
+611
+drop table t1;
+set @@session.auto_increment_increment=10, @@session.auto_increment_offset=1;
+create table t1 (a int not null auto_increment, primary key (a)) engine=myisam;
+insert into t1 values(2),(12),(22),(32),(42);
+insert into t1 values (NULL),(NULL);
+insert into t1 values (3),(NULL),(NULL);
+select * from t1;
+a
+1
+3
+11
+21
+31
+select * from t1;
+a
+1
+2
+3
+11
+12
+21
+22
+31
+32
+42
+drop table t1;
diff --git a/mysql-test/t/mix_innodb_myisam_binlog.test b/mysql-test/t/mix_innodb_myisam_binlog.test
index ba519acd8c2..00be4c83efc 100644
--- a/mysql-test/t/mix_innodb_myisam_binlog.test
+++ b/mysql-test/t/mix_innodb_myisam_binlog.test
@@ -25,6 +25,7 @@ insert into t1 values(1);
 insert into t2 select * from t1;
 commit;
 
+--replace_column 5 #
 show binlog events from 95;
 
 delete from t1;
@@ -37,6 +38,7 @@ insert into t2 select * from t1;
 # should say some changes to non-transact1onal tables couldn't be rolled back
 rollback;
 
+--replace_column 5 #
 show binlog events from 95;
 
 delete from t1;
@@ -51,6 +53,7 @@ insert into t2 select * from t1;
 rollback to savepoint my_savepoint;
 commit;
 
+--replace_column 5 #
 show binlog events from 95;
 
 delete from t1;
@@ -67,6 +70,7 @@ insert into t1 values(7);
 commit;
 select a from t1 order by a; # check that savepoints work :)
 
+--replace_column 5 #
 show binlog events from 95;
 
 # and when ROLLBACK is not explicit?
@@ -87,6 +91,7 @@ connection con2;
 # so SHOW BINLOG EVENTS may come before con1 does the loggin. To be sure that
 # logging has been done, we use a user lock.
 select get_lock("a",10);
+--replace_column 5 #
 show binlog events from 95;
 
 # and when not in a transact1on?
@@ -97,6 +102,7 @@ reset master;
 insert into t1 values(9);
 insert into t2 select * from t1;
 
+--replace_column 5 #
 show binlog events from 95;
 
 # Check that when the query updat1ng the MyISAM table is the first in the
@@ -108,10 +114,12 @@ reset master;
 insert into t1 values(10); # first make t1 non-empty
 begin;
 insert into t2 select * from t1;
+--replace_column 5 #
 show binlog events from 95;
 insert into t1 values(11);
 commit;
 
+--replace_column 5 #
 show binlog events from 95;
 
 
@@ -129,6 +137,7 @@ insert into t1 values(12);
 insert into t2 select * from t1;
 commit;
 
+--replace_column 5 #
 show binlog events from 95;
 
 delete from t1;
@@ -140,6 +149,7 @@ insert into t1 values(13);
 insert into t2 select * from t1;
 rollback;
 
+--replace_column 5 #
 show binlog events from 95;
 
 delete from t1;
@@ -154,6 +164,7 @@ insert into t2 select * from t1;
 rollback to savepoint my_savepoint;
 commit;
 
+--replace_column 5 #
 show binlog events from 95;
 
 delete from t1;
@@ -170,6 +181,7 @@ insert into t1 values(18);
 commit;
 select a from t1 order by a; # check that savepoints work :)
 
+--replace_column 5 #
 show binlog events from 95;
 
 drop table t1,t2;
diff --git a/mysql-test/t/rpl_auto_increment-master.opt b/mysql-test/t/rpl_auto_increment-master.opt
new file mode 100644
index 00000000000..a8a6af19da9
--- /dev/null
+++ b/mysql-test/t/rpl_auto_increment-master.opt
@@ -0,0 +1 @@
+--auto-increment-increment=10 --auto-increment-offset=2
diff --git a/mysql-test/t/rpl_auto_increment.test b/mysql-test/t/rpl_auto_increment.test
new file mode 100644
index 00000000000..cfe1d44b11a
--- /dev/null
+++ b/mysql-test/t/rpl_auto_increment.test
@@ -0,0 +1,104 @@
+#
+# Test of auto_increment with offset
+#
+source include/have_innodb.inc;
+source include/master-slave.inc;
+
+create table t1 (a int not null auto_increment,b int, primary key (a)) engine=myisam auto_increment=3;
+insert into t1 values (NULL,1),(NULL,2),(NULL,3);
+select * from t1;
+
+sync_slave_with_master;
+select * from t1;
+connection master;
+drop table t1;
+
+create table t1 (a int not null auto_increment,b int, primary key (a)) engine=myisam;
+insert into t1 values (1,1),(NULL,2),(3,3),(NULL,4);
+delete from t1 where b=4;
+insert into t1 values (NULL,5),(NULL,6);
+select * from t1;
+
+sync_slave_with_master;
+select * from t1;
+connection master;
+
+drop table t1;
+
+set @@session.auto_increment_increment=100, @@session.auto_increment_offset=10;
+show variables like "%auto%";
+
+create table t1 (a int not null auto_increment, primary key (a)) engine=myisam;
+# Insert with 2 insert statements to get better testing of logging
+insert into t1 values (NULL),(5),(NULL);
+insert into t1 values (250),(NULL);
+select * from t1;
+insert into t1 values (1000);
+set @@insert_id=400;
+insert into t1 values(NULL),(NULL);
+select * from t1;
+
+sync_slave_with_master;
+select * from t1;
+connection master;
+drop table t1;
+
+#
+# Same test with innodb (as the innodb code is a bit different)
+#
+create table t1 (a int not null auto_increment, primary key (a)) engine=innodb;
+# Insert with 2 insert statements to get better testing of logging
+insert into t1 values (NULL),(5),(NULL);
+insert into t1 values (250),(NULL);
+select * from t1;
+insert into t1 values (1000);
+set @@insert_id=400;
+insert into t1 values(NULL),(NULL);
+select * from t1;
+
+sync_slave_with_master;
+select * from t1;
+connection master;
+drop table t1;
+
+set @@session.auto_increment_increment=1, @@session.auto_increment_offset=1;
+create table t1 (a int not null auto_increment, primary key (a)) engine=myisam;
+# Insert with 2 insert statements to get better testing of logging
+insert into t1 values (NULL),(5),(NULL),(NULL);
+insert into t1 values (500),(NULL),(502),(NULL),(NULL);
+select * from t1;
+set @@insert_id=600;
+--error 1062
+insert into t1 values(600),(NULL),(NULL);
+set @@insert_id=600;
+insert ignore into t1 values(600),(NULL),(NULL),(610),(NULL);
+select * from t1;
+
+sync_slave_with_master;
+select * from t1;
+connection master;
+drop table t1;
+
+#
+# Test that auto-increment works when slave has rows in the table
+#
+set @@session.auto_increment_increment=10, @@session.auto_increment_offset=1;
+
+create table t1 (a int not null auto_increment, primary key (a)) engine=myisam;
+
+sync_slave_with_master;
+insert into t1 values(2),(12),(22),(32),(42);
+connection master;
+
+insert into t1 values (NULL),(NULL);
+insert into t1 values (3),(NULL),(NULL);
+select * from t1;
+
+sync_slave_with_master;
+select * from t1;
+connection master;
+
+drop table t1;
+
+# End cleanup
+sync_slave_with_master;