Commit dc79caa9 authored by unknown's avatar unknown
Browse files

Merge mysqldev@production.mysql.com:my/mysql-5.0-build 

into mysql.com:/home/dlenev/src/mysql-5.0-build
parents 8a25ac88 b7264f8b

mysql-test/r/federated.result

+1 −1
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ CREATE TABLE federated.`t1%` ( 
`name` varchar(32) NOT NULL default ''

    )

ENGINE="FEDERATED" DEFAULT CHARSET=latin1

COMMENT='mysql://root@127.0.0.1:9308/federated/t1%';

COMMENT='mysql://root@127.0.0.1:SLAVE_PORT/federated/t1%';

INSERT INTO federated.`t1%` (id, name) VALUES (1, 'foo');

INSERT INTO federated.`t1%` (id, name) VALUES (2, 'fee');

SELECT * FROM federated.`t1%`;

mysql-test/t/federated.test

+1 −0
Original line number Diff line number Diff line
@@ -125,6 +125,7 @@ SELECT * FROM federated.t1; 
DELETE FROM federated.t1;

DROP TABLE IF EXISTS federated.t1;



--replace_result $SLAVE_MYPORT SLAVE_PORT

eval CREATE TABLE federated.`t1%` (

    `id` int(20) NOT NULL,

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