Added test for PTHREAD_YIELD

Removed test of default master parameter
Don't lock locked tables in REPAIR
Changed optimzation for SELECT * from table,table ORDER BY keypart LIMIT

7 files changed, 36 insertions, 8 deletions

diff --git a/mysql-test/include/have_default_master.inc b/mysql-test/include/have_default_master.inc
deleted file mode 100644
index eff1414c16a..00000000000
--- a/mysql-test/include/have_default_master.inc
+++ /dev/null
@@ -1,3 +0,0 @@
--- require r/have_default_master.require
-connection master;
-show variables like "port";
diff --git a/mysql-test/r/have_default_master.require b/mysql-test/r/have_default_master.require
deleted file mode 100644
index ca8342ffb08..00000000000
--- a/mysql-test/r/have_default_master.require
+++ /dev/null
@@ -1,2 +0,0 @@
-Variable_name	Value
-port	9306
diff --git a/mysql-test/r/lock.result b/mysql-test/r/lock.result
index 7b116326fc4..7b1be604024 100644
--- a/mysql-test/r/lock.result
+++ b/mysql-test/r/lock.result
@@ -1,2 +1,6 @@
 dummy1	count(distinct id)
 NULL	1
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+Table	Op	Msg_type	Msg_text
+test.t2	check	error	Table 't2' was not locked with LOCK TABLES
diff --git a/mysql-test/t/lock.test b/mysql-test/t/lock.test
index 777129ec814..385713174d2 100644
--- a/mysql-test/t/lock.test
+++ b/mysql-test/t/lock.test
@@ -21,3 +21,35 @@ LOCK TABLE t1 WRITE,t2 write;
 insert into t2 SELECT * from t1;
 update t1 set id=1 where id=-1;
 drop table t1,t2;
+
+
+#
+# Check bug with INSERT ... SELECT with lock tables
+#
+
+CREATE TABLE t1 (
+  index1 smallint(6) default NULL,
+  nr smallint(6) default NULL,
+  KEY index1(index1)
+) TYPE=MyISAM;
+
+CREATE TABLE t2 (
+  nr smallint(6) default NULL,
+  name varchar(20) default NULL
+) TYPE=MyISAM;
+
+INSERT INTO t2 VALUES (1,'item1');
+INSERT INTO t2 VALUES (2,'item2');
+
+# problem begins here!
+lock tables t1 write, t2 read;
+insert into t1 select 1,nr from t2 where name='item1';
+insert into t1 select 2,nr from t2 where name='item2';
+unlock tables;
+check table t1;
+
+# Check error message
+lock tables t1 write;
+check table t2;
+unlock tables;
+drop table t1,t2;
diff --git a/mysql-test/t/rpl000014.test b/mysql-test/t/rpl000014.test
index 34e160a760c..ca83342c41d 100644
--- a/mysql-test/t/rpl000014.test
+++ b/mysql-test/t/rpl000014.test
@@ -1,5 +1,4 @@
 source include/master-slave.inc;
-source include/have_default_master.inc;
 connection master;
 show master status;
 save_master_pos;
diff --git a/mysql-test/t/rpl000015.test b/mysql-test/t/rpl000015.test
index 825d1317bbc..b6e3ceaf419 100644
--- a/mysql-test/t/rpl000015.test
+++ b/mysql-test/t/rpl000015.test
@@ -1,6 +1,5 @@
 connect (master,localhost,root,,test,0,mysql-master.sock);
 connect (slave,localhost,root,,test,0, mysql-slave.sock);
-source include/have_default_master.inc;
 connection master;
 reset master;
 show master status;
diff --git a/mysql-test/t/rpl000016.test b/mysql-test/t/rpl000016.test
index a1450089898..b322858f388 100644
--- a/mysql-test/t/rpl000016.test
+++ b/mysql-test/t/rpl000016.test
@@ -1,6 +1,5 @@
 connect (master,localhost,root,,test,0,mysql-master.sock);
 connect (slave,localhost,root,,test,0,mysql-slave.sock);
-source include/have_default_master.inc;
 system cat /dev/null > var/slave-data/master.info;
 system chmod 000 var/slave-data/master.info;
 connection slave;