Merge govinda.patg.net:/home/patg/mysql-build/mysql-5.0-merge1

into  govinda.patg.net:/home/patg/mysql-build/mysql-5.1-merge1


mysql-test/r/federated.result:
  BUG #19773
  
  Hand-merge conflicts from 5.0 to 5.1
mysql-test/t/federated.test:
  BUG #19773
  
  Hand-merge conflicts from 5.0 to 5.1
sql/ha_federated.cc:
  BUG #19773
  
  Hand-merge conflicts from 5.0 to 5.1
sql/ha_federated.h:
  BUG #19773
  
  Hand-merge conflicts from 5.0 to 5.1

1 files changed, 18 insertions, 13 deletions

diff --git a/mysql-test/t/federated.test b/mysql-test/t/federated.test
index 5f5c8d44f35..805c770edaf 100644
--- a/mysql-test/t/federated.test
+++ b/mysql-test/t/federated.test
@@ -1256,6 +1256,10 @@ SELECT LAST_INSERT_ID();
 INSERT INTO federated.t1 VALUES ();
 SELECT LAST_INSERT_ID();
 SELECT * FROM federated.t1;
+DROP TABLE federated.t1;
+
+connection slave;
+DROP TABLE federated.t1;
 
 #
 # Bug#17377 Federated Engine returns wrong Data, always the rows
@@ -1313,16 +1317,17 @@ DROP TABLE federated.bug_17377_table;
 DROP TABLE federated.t1;
 
 #
-# Test multi updates and deletes without keys
+# BUG 19773 Crash when using multi-table updates, deletes
+# with federated tables
 #
-
-# The following can be enabled when bug #19773 has been fixed
---disable_parsing
 connection slave;
 create table federated.t1 (i1 int, i2 int, i3 int);
 create table federated.t2 (id int, c1 varchar(20), c2 varchar(20));
+
 connection master;
+--replace_result $SLAVE_MYPORT SLAVE_PORT
 eval create table federated.t1 (i1 int, i2 int, i3 int) ENGINE=FEDERATED CONNECTION='mysql://root@127.0.0.1:$SLAVE_MYPORT/federated/t1';
+--replace_result $SLAVE_MYPORT SLAVE_PORT
 eval create table federated.t2 (id int, c1 varchar(20), c2 varchar(20)) ENGINE=FEDERATED CONNECTION='mysql://root@127.0.0.1:$SLAVE_MYPORT/federated/t2';
 insert into federated.t1 values (1,5,10),(3,7,12),(4,5,2),(9,10,15),(2,2,2);
 insert into federated.t2 values (9,"abc","def"),(5,"opq","lmn"),(2,"test t","t test");
@@ -1331,22 +1336,23 @@ select * from federated.t2;
 update federated.t1,federated.t2 set t1.i2=15, t2.c2="ppc" where t1.i1=t2.id;
 select * from federated.t1 order by i1;
 select * from federated.t2 order by id;
-delete   t1.*,t2.* from federated.t1,federated.t2 where t1.i2=t2.id;
+delete   federated.t1.*,federated.t2.* from federated.t1,federated.t2 where t1.i2=t2.id;
 select * from federated.t1 order by i1;
 select * from federated.t2 order by id;
 drop table federated.t1, federated.t2;
 connection slave;
 drop table federated.t1, federated.t2;
-connection master;
 
 # Test multi updates and deletes with keys
-
 connection slave;
 create table federated.t1 (i1 int, i2 int, i3 int, primary key (i1));
 create table federated.t2 (id int, c1 varchar(20), c2 varchar(20), primary key (id));
+
 connection master;
-eval create table federated.t1 (i1 int auto_increment not null, i2 int, i3 int, primary key (i1)) ENGINE=FEDERATED ENGINE=FEDERATED CONNECTION='mysql://root@127.0.0.1:$SLAVE_MYPORT/federated/t1';
-eval create table federated.t2 (id int auto_increment not null, c1 varchar(20), c2 varchar(20), primary key(id)) ENGINE=FEDERATED ENGINE=FEDERATED CONNECTION='mysql://root@127.0.0.1:$SLAVE_MYPORT/federated/t2';
+--replace_result $SLAVE_MYPORT SLAVE_PORT
+eval create table federated.t1 (i1 int auto_increment not null, i2 int, i3 int, primary key (i1)) ENGINE=FEDERATED CONNECTION='mysql://root@127.0.0.1:$SLAVE_MYPORT/federated/t1';
+--replace_result $SLAVE_MYPORT SLAVE_PORT
+eval create table federated.t2 (id int auto_increment not null, c1 varchar(20), c2 varchar(20), primary key(id)) ENGINE=FEDERATED CONNECTION='mysql://root@127.0.0.1:$SLAVE_MYPORT/federated/t2';
 insert into federated.t1 values (1,5,10),(3,7,12),(4,5,2),(9,10,15),(2,2,2);
 insert into federated.t2 values (9,"abc","def"),(5,"opq","lmn"),(2,"test t","t test");
 select * from federated.t1 order by i1;
@@ -1354,13 +1360,12 @@ select * from federated.t2 order by id;
 update federated.t1,federated.t2 set t1.i2=15, t2.c2="ppc" where t1.i1=t2.id;
 select * from federated.t1 order by i1;
 select * from federated.t2 order by id;
-delete t1.*,t2.* from federated.t1,federated.t2 where t1.i2=t2.id;
+delete federated.t1.*,federated.t2.* from federated.t1,federated.t2 where t1.i2=t2.id;
 select * from federated.t1 order by i1;
 select * from federated.t2 order by id;
 drop table federated.t1, federated.t2;
+
 connection slave;
 drop table federated.t1, federated.t2;
-connection master;
---enable_parsing
 
---source include/federated_cleanup.inc
+source include/federated_cleanup.inc;