Commit 1bbd24a6 authored Jan 31, 2006 by unknown

Merge bk-internal:/home/bk/mysql-5.0

into  mysql.com:/usr/local/mysql/mysql-5.0

parents 852a5405 bccad0dc

mysql-test/r/federated.result

+1 −1

Original line number	Diff line number	Diff line
		@@ -1530,7 +1530,7 @@ CREATE TABLE federated.t1 (
		PRIMARY KEY (`id`)
		)
		ENGINE="FEDERATED" DEFAULT CHARSET=latin1
		CONNECTION='mysql://root@127.0.0.1:9308/federated/t1';
		CONNECTION='mysql://root@127.0.0.1:SLAVE_PORT/federated/t1';
		INSERT INTO federated.t1 VALUES ();
		SELECT LAST_INSERT_ID();
		LAST_INSERT_ID()

mysql-test/t/federated.test

+1 −0

Original line number	Diff line number	Diff line
		@@ -1235,6 +1235,7 @@ CREATE TABLE federated.t1 (

		connection master;
		DROP TABLE IF EXISTS federated.t1;
		--replace_result $SLAVE_MYPORT SLAVE_PORT
		eval CREATE TABLE federated.t1 (
		`id` int(20) NOT NULL auto_increment,
		PRIMARY KEY (`id`)