Commit ada1f886 authored by unknown's avatar unknown
Browse files

Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 

into  mysql.com:/home/mysql_src/mysql-5.0
parents 16f3cb03 06c8c18a

mysql-test/r/federated.result

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ Table Create Table 
t2	CREATE TABLE `t2` (

  `id` int(20) NOT NULL,

  `name` varchar(32) NOT NULL default ''

) ENGINE=FEDERATED DEFAULT CHARSET=latin1 CONNECTION='mysql://root@127.0.0.1:9308/federated/t1'

) ENGINE=FEDERATED DEFAULT CHARSET=latin1 CONNECTION='mysql://root@127.0.0.1:SLAVE_PORT/federated/t1'

INSERT INTO federated.t2 (id, name) VALUES (1, 'foo');

INSERT INTO federated.t2 (id, name) VALUES (2, 'fee');

SELECT * FROM federated.t2;

mysql-test/t/federated.test

+2 −1
Original line number Diff line number Diff line
@@ -75,7 +75,8 @@ eval CREATE TABLE federated.t2 ( 
  ENGINE="FEDERATED" DEFAULT CHARSET=latin1

  CONNECTION='mysql://root@127.0.0.1:$SLAVE_MYPORT/federated/t1';



SHOW CREATE TABLE federated.t2;

--replace_result $SLAVE_MYPORT SLAVE_PORT

eval SHOW CREATE TABLE federated.t2;



INSERT INTO federated.t2 (id, name) VALUES (1, 'foo');

INSERT INTO federated.t2 (id, name) VALUES (2, 'fee');