merge

myisam/mi_check.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/table.h:
  Auto merged

9 files changed, 62 insertions, 0 deletions

diff --git a/mysql-test/r/rpl000018.result b/mysql-test/r/rpl000018.result
new file mode 100644
index 00000000000..7c89c2ef2b2
--- /dev/null
+++ b/mysql-test/r/rpl000018.result
@@ -0,0 +1,5 @@
+Log_name
+master-bin.001
+master-bin.002
+n
+3351
diff --git a/mysql-test/r/status.result b/mysql-test/r/status.result
new file mode 100644
index 00000000000..8f3ad3e0d59
--- /dev/null
+++ b/mysql-test/r/status.result
@@ -0,0 +1,6 @@
+Variable_name	Value
+Table_locks_immediate	0
+Table_locks_waited	0
+Variable_name	Value
+Table_locks_immediate	3
+Table_locks_waited	1
diff --git a/mysql-test/std_data/master-bin.001 b/mysql-test/std_data/master-bin.001
new file mode 100644
index 00000000000..fa30d8e5302
--- /dev/null
+++ b/mysql-test/std_data/master-bin.001
diff --git a/mysql-test/t/overflow.test b/mysql-test/t/overflow.test
new file mode 100644
index 00000000000..73554200dce
--- /dev/null
+++ b/mysql-test/t/overflow.test
@@ -0,0 +1,4 @@
+connect (con1,localhost,boo,,test,0,mysql-master.sock);
+connection con1;
+-- error 1064;
+drop database AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA;
diff --git a/mysql-test/t/rpl000018-master.opt b/mysql-test/t/rpl000018-master.opt
new file mode 100644
index 00000000000..ad2c6a647b5
--- /dev/null
+++ b/mysql-test/t/rpl000018-master.opt
@@ -0,0 +1 @@
+-O max_binlog_size=4096
diff --git a/mysql-test/t/rpl000018-master.sh b/mysql-test/t/rpl000018-master.sh
new file mode 100755
index 00000000000..71f0f12d0c5
--- /dev/null
+++ b/mysql-test/t/rpl000018-master.sh
@@ -0,0 +1,3 @@
+rm -f $MYSQL_TEST_DIR/var/lib/master-bin.* 
+cp $MYSQL_TEST_DIR/std_data/master-bin.001  $MYSQL_TEST_DIR/var/lib/
+echo ./master-bin.001 >  $MYSQL_TEST_DIR/var/lib/master-bin.index
diff --git a/mysql-test/t/rpl000018-slave.opt b/mysql-test/t/rpl000018-slave.opt
new file mode 100644
index 00000000000..e854f0d0bb2
--- /dev/null
+++ b/mysql-test/t/rpl000018-slave.opt
@@ -0,0 +1 @@
+--skip-slave-start --abort-slave-event-count=1
diff --git a/mysql-test/t/rpl000018.test b/mysql-test/t/rpl000018.test
new file mode 100644
index 00000000000..44236323d1d
--- /dev/null
+++ b/mysql-test/t/rpl000018.test
@@ -0,0 +1,19 @@
+connect (master,localhost,root,,test,0,mysql-master.sock);
+connect (slave,localhost,root,,test,0,mysql-slave.sock);
+connection slave;
+reset slave;
+slave start;
+connection master;
+show master logs;
+drop table if exists t1;
+create table t1(n int);
+insert into t1 values (3351);
+save_master_pos;
+connection slave;
+sync_with_master;
+select * from t1;
+connection master;
+drop table t1;
+save_master_pos;
+connection slave;
+sync_with_master;
diff --git a/mysql-test/t/status.test b/mysql-test/t/status.test
new file mode 100644
index 00000000000..7c825469f09
--- /dev/null
+++ b/mysql-test/t/status.test
@@ -0,0 +1,23 @@
+connect (con1,localhost,root,,test,0,mysql-master.sock);
+connect (con2,localhost,root,,test,0,mysql-master.sock);
+
+flush status;
+show status like 'Table_lock%';
+connection con1;
+SET SQL_LOG_BIN=0;
+drop table if exists t1;
+create table t1(n int);
+insert into t1 values(1);
+connection con2;
+lock tables t1 read;
+unlock tables;
+lock tables t1 read;
+connection con1;
+send update t1 set n = 3;
+connection con2;
+sleep 0.5;
+unlock tables;
+connection con1;
+reap;
+show status like 'Table_lock%';
+drop table t1;