bk commit into 5.1 tree (pgalbraith:1.2120)

[Patrick Galbraith]

Below is the list of changes that have just been committed into a local
5.1 repository of pgalbraith. When pgalbraith does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2120 06/03/19 06:49:39 pgalbraith@stripped +1 -0
  federated_server.test:
    WL# 3031 Working test and results. 

  mysql-test/t/federated_server.test
    1.2 06/03/19 06:48:55 pgalbraith@stripped +30 -9
    WL# 3031 Working test and results. 

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	pgalbraith
# Host:	production.mysql.com
# Root:	/usersnfs/pgalbraith/mysql-5.1-wl3031-new

--- 1.1/mysql-test/t/federated_server.test	2006-03-14 09:17:04 +01:00
+++ 1.2/mysql-test/t/federated_server.test	2006-03-19 06:48:55 +01:00
@@ -11,7 +11,7 @@
 DROP TABLE IF EXISTS first_db.t1;
 CREATE TABLE first_db.t1 (
     `id` int(20) NOT NULL,
-    `name` varchar(32) NOT NULL default ''
+    `name` varchar(64) NOT NULL default ''
     )
   DEFAULT CHARSET=latin1;
 
@@ -19,7 +19,7 @@
 DROP TABLE IF EXISTS second_db.t1;
 CREATE TABLE second_db.t1 (
     `id` int(20) NOT NULL,
-    `name` varchar(32) NOT NULL default ''
+    `name` varchar(64) NOT NULL default ''
     )
   DEFAULT CHARSET=latin1;
 
@@ -27,7 +27,7 @@
 
 drop server if exists 'server_one';
 eval create server 'server_one' foreign data wrapper 'mysql' options
-  (HOST 'localhost',
+  (HOST '127.0.0.1',
   DATABASE 'first_db',
   USER 'root',
   PASSWORD '',
@@ -37,7 +37,7 @@
 
 drop server if exists 'server_two';
 eval create server 'server_two' foreign data wrapper 'mysql' options
-  (HOST 'localhost',
+  (HOST '127.0.0.1',
   DATABASE 'second_db',
   USER 'root',
   PASSWORD '',
@@ -48,30 +48,51 @@
 select * from mysql.servers;
 
 DROP TABLE IF EXISTS federated.old;
-CREATE TABLE federated.old (
+eval CREATE TABLE federated.old (
     `id` int(20) NOT NULL,
-    `name` varchar(32) NOT NULL default ''
+    `name` varchar(64) NOT NULL default ''
     )
   ENGINE="FEDERATED" DEFAULT CHARSET=latin1
   CONNECTION='mysql://root@stripped:$SLAVE_MYPORT/first_db/t1';
 
-INSERT INTO federated.old (id, name) values (1, 'first_db first value');
+INSERT INTO federated.old (id, name) values (1, 'federated.old url');
 
 SELECT * FROM federated.old;
 
+DROP TABLE IF EXISTS federated.old2;
+eval CREATE TABLE federated.old2 (
+    `id` int(20) NOT NULL,
+    `name` varchar(64) NOT NULL default ''
+    )
+  ENGINE="FEDERATED" DEFAULT CHARSET=latin1
+  CONNECTION='mysql://root@stripped:$SLAVE_MYPORT/second_db/t1';
+
+INSERT INTO federated.old2 (id, name) values (1, 'federated.old2 url');
+
 DROP TABLE IF EXISTS federated.t1;
 CREATE TABLE federated.t1 (
     `id` int(20) NOT NULL,
-    `name` varchar(32) NOT NULL default ''
+    `name` varchar(64) NOT NULL default ''
     )
   ENGINE="FEDERATED" DEFAULT CHARSET=latin1
   CONNECTION='server_one';
 
-INSERT INTO federated.t1 (id, name) values (1, 'First db record');
+INSERT INTO federated.t1 (id, name) values (1, 'server_one, new scheme');
 
 SELECT * FROM federated.t1;
 
+ALTER SERVER 'server_one' options(DATABASE 'second_db');
+
+flush tables;
+
+INSERT INTO federated.t1 (id, name) values (1, 'server_two, new scheme');
+SELECT * FROM federated.t1;
+
 drop table federated.t1;
+
+drop server 'server_one';
+drop server 'server_two';
+select * from mysql.servers;
 
 connection slave;
 drop table first_db.t1;