BUG#13724 conditionally added CONNECTION='connect string' for SHOW CREATE TABLE

3 files changed, 13 insertions, 0 deletions

diff --git a/mysql-test/r/federated.result b/mysql-test/r/federated.result
index e0e0bba3271..f40919a41a4 100644
--- a/mysql-test/r/federated.result
+++ b/mysql-test/r/federated.result
@@ -74,6 +74,12 @@ CREATE TABLE federated.t2 (
     )
 ENGINE="FEDERATED" DEFAULT CHARSET=latin1
 CONNECTION='mysql://root@127.0.0.1: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@127.0.0.1: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;
diff --git a/mysql-test/t/federated.test b/mysql-test/t/federated.test
index c401468a940..453343e6f09 100644
--- a/mysql-test/t/federated.test
+++ b/mysql-test/t/federated.test
@@ -75,6 +75,8 @@ eval CREATE TABLE federated.t2 (
   ENGINE="FEDERATED" DEFAULT CHARSET=latin1
   CONNECTION='mysql://root@127.0.0.1:$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');
 
diff --git a/sql/sql_show.cc b/sql/sql_show.cc
index 2d98e834de7..807b72595db 100644
--- a/sql/sql_show.cc
+++ b/sql/sql_show.cc
@@ -1023,6 +1023,11 @@ store_create_info(THD *thd, TABLE_LIST *table_list, String *packet)
       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;