Merge mockturtle.local:/home/dlenev/src/mysql-5.0-bg21281

into  mockturtle.local:/home/dlenev/src/mysql-5.1-bg21281-2


mysql-test/t/federated.test:
  Auto merged
mysys/thr_lock.c:
  Auto merged
mysql-test/r/federated.result:
  SCCS merged

2 files changed, 28 insertions, 0 deletions

diff --git a/mysql-test/r/federated.result b/mysql-test/r/federated.result
index cfb445e9427..7e9cb81a8f0 100644
--- a/mysql-test/r/federated.result
+++ b/mysql-test/r/federated.result
@@ -1883,6 +1883,20 @@ a	b
 2	Curly
 drop table federated.t1;
 drop table federated.t1;
+
+Bug#18287 create federated table always times out, error 1159 ' '
+
+Test that self-references work
+
+create table federated.t1 (a int primary key);
+create table federated.t2 (a int primary key)
+ENGINE=FEDERATED
+connection='mysql://root@127.0.0.1:SLAVE_PORT/federated/t1';
+insert into federated.t1 (a) values (1);
+select * from federated.t2;
+a
+1
+drop table federated.t1, federated.t2;
 CREATE TABLE federated.t1 (a INT PRIMARY KEY) DEFAULT CHARSET=utf8;
 CREATE TABLE federated.t1 (a INT PRIMARY KEY)
 ENGINE=FEDERATED
diff --git a/mysql-test/t/federated.test b/mysql-test/t/federated.test
index efca7f3232d..ee607225d35 100644
--- a/mysql-test/t/federated.test
+++ b/mysql-test/t/federated.test
@@ -1685,6 +1685,20 @@ drop table federated.t1;
 connection slave;
 drop table federated.t1;
 
+--echo
+--echo Bug#18287 create federated table always times out, error 1159 ' '
+--echo
+--echo Test that self-references work
+--echo
+connection slave;
+create table federated.t1 (a int primary key);
+--replace_result $SLAVE_MYPORT SLAVE_PORT
+eval create table federated.t2 (a int primary key)
+  ENGINE=FEDERATED
+  connection='mysql://root@127.0.0.1:$SLAVE_MYPORT/federated/t1';
+insert into federated.t1 (a) values (1);
+select * from federated.t2;
+drop table federated.t1, federated.t2;
 
 #
 # BUG#29875 Disable support for transactions