bk commit into 5.0 tree (eric:1.2031) BUG#13724

[Eric Herman]

Below is the list of changes that have just been committed into a local
5.0 repository of eric. When eric 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.2031 05/10/10 17:41:36 eric@stripped +3 -0
  BUG#13724 conditionally added CONNECTION='connect string' for SHOW CREATE TABLE

  sql/sql_show.cc
    1.289 05/10/10 17:41:07 eric@stripped +5 -0
    added connect_string for SHOW CREATE TABLE

  mysql-test/t/federated.test
    1.15 05/10/10 17:41:07 eric@stripped +2 -0
    added test for SHOW CREATE TABLE

  mysql-test/r/federated.result
    1.18 05/10/10 17:41:06 eric@stripped +6 -0
    test results for SHOW CREATE TABLE

# 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:	eric
# Host:	sleek.local
# Root:	/Users/eric/dev/mysql-5.0

--- 1.288/sql/sql_show.cc	2005-10-02 20:03:42 -07:00
+++ 1.289/sql/sql_show.cc	2005-10-10 17:41:07 -07:00
@@ -1023,6 +1023,11 @@
       packet->append(" COMMENT=", 9);
       append_unescaped(packet, share->comment, strlen(share->comment));
     }
+    if (share->connect_string.length)
+    {
+      packet->append(" CONNECTION=", 12);
+      append_unescaped(packet, share->connect_string.str,
share->connect_string.length);
+    }
     if (file->raid_type)
     {
       uint length;

--- 1.17/mysql-test/r/federated.result	2005-09-30 16:26:18 -07:00
+++ 1.18/mysql-test/r/federated.result	2005-10-10 17:41:06 -07:00
@@ -74,6 +74,12 @@
     )
 ENGINE="FEDERATED" DEFAULT CHARSET=latin1
 CONNECTION='mysql://root@stripped:SLAVE_PORT/federated/t1';
+SHOW CREATE TABLE federated.t2;
+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@stripped:9308/federated/t1'
 INSERT INTO federated.t2 (id, name) VALUES (1, 'foo');
 INSERT INTO federated.t2 (id, name) VALUES (2, 'fee');
 SELECT * FROM federated.t2;

--- 1.14/mysql-test/t/federated.test	2005-09-30 16:26:18 -07:00
+++ 1.15/mysql-test/t/federated.test	2005-10-10 17:41:07 -07:00
@@ -75,6 +75,8 @@
   ENGINE="FEDERATED" DEFAULT CHARSET=latin1
   CONNECTION='mysql://root@stripped:$SLAVE_MYPORT/federated/t1';
 
+SHOW CREATE TABLE federated.t2;
+
 INSERT INTO federated.t2 (id, name) VALUES (1, 'foo');
 INSERT INTO federated.t2 (id, name) VALUES (2, 'fee');