Merge

mysql-test/r/lock.result:
  Auto merged
mysql-test/r/rpl_log.result:
  Auto merged
mysql-test/t/lock.test:
  Auto merged
mysql-test/r/rpl_rotate_logs.result:
  SCCS merged
sql/sql_parse.cc:
  SCCS merged
sql/sql_repl.cc:
  SCCS merged

3 files changed, 31 insertions, 21 deletions

diff --git a/mysql-test/r/lock.result b/mysql-test/r/lock.result
index 16c92fa201f..a1efb1a8e69 100644
--- a/mysql-test/r/lock.result
+++ b/mysql-test/r/lock.result
@@ -47,3 +47,13 @@ unlock tables;
 lock tables t1 write, t1 as t1_alias read;
 insert into t1 select index1,nr from t1 as t1_alias;
 drop table t1,t2;
+create table t1 ( a int(11) not null auto_increment, primary key(a));
+create table t2 ( a int(11) not null auto_increment, primary key(a));
+lock tables t1 write, t2 read;
+delete from t1 using t1,t2 where t1.a=t2.a;
+delete t1 from t1,t2 where t1.a=t2.a;
+delete from t2 using t1,t2 where t1.a=t2.a;
+ERROR HY000: Table 't2' was locked with a READ lock and can't be updated
+delete t2 from t1,t2 where t1.a=t2.a;
+ERROR HY000: Table 't2' was locked with a READ lock and can't be updated
+drop table t1,t2;
diff --git a/mysql-test/r/rpl_log.result b/mysql-test/r/rpl_log.result
index 5d61746b984..d32956428a5 100644
--- a/mysql-test/r/rpl_log.result
+++ b/mysql-test/r/rpl_log.result
@@ -68,14 +68,14 @@ master-bin.000002	260	Query	1	346	use `test`; create table t1 (n int)
 master-bin.000002	346	Query	1	434	use `test`; insert into t1 values (1)
 master-bin.000002	434	Query	1	510	use `test`; drop table t1
 show binary logs;
-Log_name
-master-bin.000001
-master-bin.000002
+Log_name	File_size
+master-bin.000001	0
+master-bin.000002	276
 start slave;
 show binary logs;
-Log_name
-slave-bin.000001
-slave-bin.000002
+Log_name	File_size
+slave-bin.000001	0
+slave-bin.000002	170
 show binlog events in 'slave-bin.000001' from 4;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 slave-bin.000001	4	Format_desc	2	98	Server ver: VERSION, Binlog ver: 4
diff --git a/mysql-test/r/rpl_rotate_logs.result b/mysql-test/r/rpl_rotate_logs.result
index de177d12196..098f8e4a5dd 100644
--- a/mysql-test/r/rpl_rotate_logs.result
+++ b/mysql-test/r/rpl_rotate_logs.result
@@ -26,10 +26,10 @@ create table t2(m int not null auto_increment primary key);
 insert into t2 values (34),(67),(123);
 flush logs;
 show binary logs;
-Log_name
-master-bin.000001
-master-bin.000002
-master-bin.000003
+Log_name	File_size
+master-bin.000001	0
+master-bin.000002	0
+master-bin.000003	4
 create table t3 select * from temp_table;
 select * from t3;
 a
@@ -42,18 +42,18 @@ set global sql_slave_skip_counter=1;
 start slave;
 purge master logs to 'master-bin.000002';
 show master logs;
-Log_name
-master-bin.000002
-master-bin.000003
+Log_name	File_size
+master-bin.000002	0
+master-bin.000003	229
 purge binary logs to 'master-bin.000002';
 show binary logs;
-Log_name
-master-bin.000002
-master-bin.000003
+Log_name	File_size
+master-bin.000002	0
+master-bin.000003	229
 purge master logs before now();
 show binary logs;
-Log_name
-master-bin.000003
+Log_name	File_size
+master-bin.000003	229
 insert into t2 values (65);
 show slave status;
 Slave_IO_State	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	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master
@@ -73,9 +73,9 @@ count(*)
 100
 create table t4 select * from temp_table;
 show binary logs;
-Log_name
-master-bin.000003
-master-bin.000004
+Log_name	File_size
+master-bin.000003	0
+master-bin.000004	2886
 master-bin.000005
 show master status;
 File	Position	Binlog_Do_DB	Binlog_Ignore_DB