After merge fix

mysql-test/r/insert_select.result

@@ -71,9 +71,8 @@ create table t2(a int);
 insert into t2 values(1),(2);
 reset master;
 insert into t1 select * from t2;
-Duplicate entry '2' for key 1
+ERROR 23000: Duplicate entry '2' for key 1
 show binlog events;
 Log_name	Pos	Event_type	Server_id	Orig_log_pos	Info
-master-bin.001	4	Start	1	4	Server ver: VERSION, Binlog ver: 3
-master-bin.001	79	Query	1	79	use test; insert into t1 select * from t2
+master-bin.000001	4	Start	1	4	Server ver: VERSION, Binlog ver: 3
 drop table t1, t2;

mysql-test/r/loaddata.result

@@ -17,6 +17,11 @@ a	b	c	d
 2003-03-03	2003-03-03	2003-03-03	NULL
 truncate table t1;
 load data infile '../../std_data/loaddata1.dat' into table t1 fields terminated by ',' LINES STARTING BY ',' (b,c,d);
+Warnings:
+Warning	1263	Data truncated for column 'c' at row 1
+Warning	1263	Data truncated for column 'd' at row 1
+Warning	1263	Data truncated for column 'b' at row 2
+Warning	1263	Data truncated for column 'd' at row 2
 SELECT * from t1;
 a	b	c	d
 NULL	NULL	0000-00-00	0000-00-00

mysql-test/r/lowercase_table.result

@@ -21,7 +21,9 @@ select count(*) from t1;
 count(*)
 0
 select count(T1.a) from t1;
-Unknown table 'T1' in field list
+count(T1.a)
+0
 select count(bags.a) from t1 as Bags;
-Unknown table 'bags' in field list
+count(bags.a)
+0
 drop table t1;

mysql-test/r/query_cache.result

@@ -502,7 +502,6 @@ drop table t1;
 show status like "Qcache_queries_in_cache";
 Variable_name	Value
 Qcache_queries_in_cache	0
-create table t1 (a int);
 show global variables like "query_cache_min_res_unit";
 Variable_name	Value
 query_cache_min_res_unit	4096
@@ -562,6 +561,7 @@ set GLOBAL query_cache_min_res_unit=default;
 show global variables like "query_cache_min_res_unit";
 Variable_name	Value
 query_cache_min_res_unit	4096
+create table t1 (a int);
 set GLOBAL query_cache_size=1000;
 show global variables like "query_cache_size";
 Variable_name	Value

mysql-test/r/rpl_log.result

@@ -36,6 +36,8 @@ show binlog events from 79 limit 2,1;
 Log_name	Pos	Event_type	Server_id	Orig_log_pos	Info
 master-bin.000001	200	Query	1	200	use `test`; insert into t1 values (NULL)
 flush logs;
+create table t5 (a int);
+drop table t5;
 start slave;
 flush logs;
 stop slave;
@@ -56,9 +58,11 @@ master-bin.000001	1079	Query	1	1079	use `test`; drop table t1
 master-bin.000001	1127	Rotate	1	1127	master-bin.000002;pos=4
 show binlog events in 'master-bin.000002';
 Log_name	Pos	Event_type	Server_id	Orig_log_pos	Info
-master-bin.000002	4	Query	1	4	use `test`; create table t1 (n int)
-master-bin.000002	62	Query	1	62	use `test`; insert into t1 values (1)
-master-bin.000002	122	Query	1	122	use `test`; drop table t1
+master-bin.000002	4	Query	1	4	use `test`; create table t5 (a int)
+master-bin.000002	62	Query	1	62	use `test`; drop table t5
+master-bin.000002	110	Query	1	110	use `test`; create table t1 (n int)
+master-bin.000002	168	Query	1	168	use `test`; insert into t1 values (1)
+master-bin.000002	228	Query	1	228	use `test`; drop table t1
 show binary logs;
 Log_name
 master-bin.000001
@@ -79,14 +83,16 @@ slave-bin.000001	311	Query	1	311	use `test`; create table t1 (word char(20) not
 slave-bin.000001	386	Create_file	1	386	db=test;table=t1;file_id=1;block_len=581
 slave-bin.000001	1065	Exec_load	1	1056	;file_id=1
 slave-bin.000001	1088	Query	1	1079	use `test`; drop table t1
-slave-bin.000001	1136	Rotate	2	1136	slave-bin.000002;pos=4
+slave-bin.000001	1136	Query	1	4	use `test`; create table t5 (a int)
+slave-bin.000001	1194	Query	1	62	use `test`; drop table t5
+slave-bin.000001	1242	Rotate	2	1242	slave-bin.000002;pos=4
 show binlog events in 'slave-bin.000002' from 4;
 Log_name	Pos	Event_type	Server_id	Orig_log_pos	Info
-slave-bin.000002	4	Query	1	4	use `test`; create table t1 (n int)
-slave-bin.000002	62	Query	1	62	use `test`; insert into t1 values (1)
-slave-bin.000002	122	Query	1	122	use `test`; drop table t1
+slave-bin.000002	4	Query	1	110	use `test`; create table t1 (n int)
+slave-bin.000002	62	Query	1	168	use `test`; insert into t1 values (1)
+slave-bin.000002	122	Query	1	228	use `test`; drop table t1
 show slave status;
 Master_Host	Master_User	Master_Port	Connect_retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_do_db	Replicate_ignore_db	Last_errno	Last_error	Skip_counter	Exec_master_log_pos	Relay_log_space
-127.0.0.1	root	MASTER_PORT	1	master-bin.000002	170	slave-relay-bin.000002	1469	master-bin.000002	Yes	Yes			0		0	170	1473
+127.0.0.1	root	MASTER_PORT	1	master-bin.000002	276	slave-relay-bin.000002	1531	master-bin.000002	Yes	Yes			0		0	276	1535
 show binlog events in 'slave-bin.000005' from 4;
 ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Could not find target log

mysql-test/t/lowercase_table.test

@@ -20,8 +20,6 @@ drop table t3;
 create table t1 (a int);
 select count(*) from T1;
 select count(*) from t1;
---error 1109
 select count(T1.a) from t1;
---error 1109
 select count(bags.a) from t1 as Bags;
 drop table t1;

mysql-test/t/rpl_log.test

@@ -58,7 +58,7 @@ connection slave;
 # Note that the above 'slave start' will cause a 3rd rotate event (a fake one)
 # to go into the relay log (the master always sends a fake one when replication
 # starts). 
-slave start;
+start slave;
 sync_with_master;
 flush logs;
 stop slave;

sql/set_var.cc

@@ -238,7 +238,6 @@ sys_var_bool_ptr	sys_slave_compressed_protocol("slave_compressed_protocol",
 sys_var_long_ptr	sys_slave_net_timeout("slave_net_timeout",
 					      &slave_net_timeout);
 #endif
-sys_var_bool_ptr	sys_readonly("read_only", &opt_readonly);
 sys_var_long_ptr	sys_slow_launch_time("slow_launch_time",
 					     &slow_launch_time);
 sys_var_thd_ulong	sys_sort_buffer("sort_buffer_size",