database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-10 23:02:54 +03:00
Code Activity

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

Browse Source 
into  mysql.com:/usr/local/mysql/mysql-5.0
This commit is contained in:
knielsen@mysql.com
2006-01-31 16:24:25 +01:00
parent 7715538018 a002d316ed
commit a6b86d8962
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/r/federated.result
View File

@@ -1530,7 +1530,7 @@ CREATE TABLE federated.t1 (
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) )
ENGINE="FEDERATED" DEFAULT CHARSET=latin1 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 (); INSERT INTO federated.t1 VALUES ();
SELECT LAST_INSERT_ID(); SELECT LAST_INSERT_ID();
LAST_INSERT_ID() LAST_INSERT_ID()

1
mysql-test/t/federated.test
View File

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