Made changes to add federated CONNECTION information to the .frm file

(per Monty's patch).
Remove references to the "COMMENT" field.
WL#2414


mysql-test/r/federated.result:
  alter from "COMMENT=" to "CONNECTION="
mysql-test/r/federated_archive.result:
  change "COMMENT=" to "CONNECTION="
mysql-test/t/federated.test:
  change from "COMMENT=" to "CONNECTION="
mysql-test/t/federated_archive.test:
  change from "COMMENT=" to "CONNECTION="
sql/ha_federated.cc:
  Change parsing of char* table->s->comment to LEX_STRING table->s->connect_string
  (per Monty's patch)
sql/handler.h:
  added LEX_STRING "connection_string"
  (per Monty's patch)
sql/sql_yacc.yy:
  added setting of "connect_string" string and length
sql/table.cc:
  Modifying frm file to store connecting information (code change came from Monty).
sql/table.h:
  added connect_string
sql/unireg.cc:
  Storing information on connection_string (code came from Monty).

1 files changed, 24 insertions, 24 deletions

diff --git a/mysql-test/t/federated.test b/mysql-test/t/federated.test
index 255b9dc22d7..28091676dd7 100644
--- a/mysql-test/t/federated.test
+++ b/mysql-test/t/federated.test
@@ -17,7 +17,7 @@ CREATE TABLE federated.t1 (
     `name` varchar(32) NOT NULL default ''
     )
   ENGINE="FEDERATED" DEFAULT CHARSET=latin1
-  COMMENT='mysql://root@127.0.0.1:@/too/many/items/federated/t1';
+  CONNECTION='mysql://root@127.0.0.1:@/too/many/items/federated/t1';
 
 # test not enough items (malformed) in the comment string url
 --error 1432 
@@ -26,7 +26,7 @@ CREATE TABLE federated.t1 (
     `name` varchar(32) NOT NULL default ''
     )
   ENGINE="FEDERATED" DEFAULT CHARSET=latin1
-  COMMENT='mysql://root@127.0.0.1';
+  CONNECTION='mysql://root@127.0.0.1';
 
 # test non-existant table
 --replace_result $SLAVE_MYPORT SLAVE_PORT
@@ -36,7 +36,7 @@ eval CREATE TABLE federated.t1 (
     `name` varchar(32) NOT NULL default ''
     )
   ENGINE="FEDERATED" DEFAULT CHARSET=latin1
-  COMMENT='mysql://root@127.0.0.1:$SLAVE_MYPORT/federated/t3';
+  CONNECTION='mysql://root@127.0.0.1:$SLAVE_MYPORT/federated/t3';
 
 # test bad user/password 
 --replace_result $SLAVE_MYPORT SLAVE_PORT
@@ -46,7 +46,7 @@ eval CREATE TABLE federated.t1 (
     `name` varchar(32) NOT NULL default ''
     )
   ENGINE="FEDERATED" DEFAULT CHARSET=latin1
-  COMMENT='mysql://user:pass@127.0.0.1:$SLAVE_MYPORT/federated/t1';
+  CONNECTION='mysql://user:pass@127.0.0.1:$SLAVE_MYPORT/federated/t1';
 
 DROP TABLE IF EXISTS federated.t1;
 # # correct connection, same named tables
@@ -56,7 +56,7 @@ eval CREATE TABLE federated.t1 (
     `name` varchar(32) NOT NULL default ''
     )
   ENGINE="FEDERATED" DEFAULT CHARSET=latin1
-  COMMENT='mysql://root@127.0.0.1:$SLAVE_MYPORT/federated/t1';
+  CONNECTION='mysql://root@127.0.0.1:$SLAVE_MYPORT/federated/t1';
 
 INSERT INTO federated.t1 (id, name) VALUES (1, 'foo');
 INSERT INTO federated.t1 (id, name) VALUES (2, 'fee');
@@ -73,7 +73,7 @@ eval CREATE TABLE federated.t2 (
     `name` varchar(32) NOT NULL default ''
     )
   ENGINE="FEDERATED" DEFAULT CHARSET=latin1
-  COMMENT='mysql://root@127.0.0.1:$SLAVE_MYPORT/federated/t1';
+  CONNECTION='mysql://root@127.0.0.1:$SLAVE_MYPORT/federated/t1';
 
 INSERT INTO federated.t2 (id, name) VALUES (1, 'foo');
 INSERT INTO federated.t2 (id, name) VALUES (2, 'fee');
@@ -100,7 +100,7 @@ eval CREATE TABLE federated.t1 (
     `name` varchar(32) NOT NULL default ''
     )
   ENGINE="FEDERATED" DEFAULT CHARSET=latin1
-  COMMENT='mysql://root@127.0.0.1:$SLAVE_MYPORT/federated/t1%';
+  CONNECTION='mysql://root@127.0.0.1:$SLAVE_MYPORT/federated/t1%';
 
 INSERT INTO federated.t1 (id, name) VALUES (1, 'foo');
 INSERT INTO federated.t1 (id, name) VALUES (2, 'fee');
@@ -115,7 +115,7 @@ eval CREATE TABLE federated.`t1%` (
     `name` varchar(32) NOT NULL default ''
     )
   ENGINE="FEDERATED" DEFAULT CHARSET=latin1
-  COMMENT='mysql://root@127.0.0.1:$SLAVE_MYPORT/federated/t1%';
+  CONNECTION='mysql://root@127.0.0.1:$SLAVE_MYPORT/federated/t1%';
 
 INSERT INTO federated.`t1%` (id, name) VALUES (1, 'foo');
 INSERT INTO federated.`t1%` (id, name) VALUES (2, 'fee');
@@ -146,7 +146,7 @@ eval CREATE TABLE federated.t1 (
     `created` datetime default '2004-04-04 04:04:04',
     PRIMARY KEY  (`id`))
   ENGINE="FEDERATED" DEFAULT CHARSET=latin1
-  COMMENT='mysql://root@127.0.0.1:$SLAVE_MYPORT/federated/t1';
+  CONNECTION='mysql://root@127.0.0.1:$SLAVE_MYPORT/federated/t1';
 
 INSERT INTO federated.t1 (name, other) VALUES ('First Name', 11111);
 INSERT INTO federated.t1 (name, other) VALUES ('Second Name', 22222);
@@ -213,7 +213,7 @@ eval CREATE TABLE federated.t1 (
     key other(`other`),
     key created(`created`))
   ENGINE="FEDERATED" DEFAULT CHARSET=latin1
-  COMMENT='mysql://root@127.0.0.1:$SLAVE_MYPORT/federated/t1';
+  CONNECTION='mysql://root@127.0.0.1:$SLAVE_MYPORT/federated/t1';
 
 INSERT INTO federated.t1 (name, other, created)
   VALUES ('First Name', 11111, '2004-01-01 01:01:01');
@@ -284,7 +284,7 @@ eval CREATE TABLE federated.t1 (
     PRIMARY KEY  (`id`) )
   ENGINE="FEDERATED"
   DEFAULT CHARSET=latin1
-  COMMENT='mysql://root@127.0.0.1:$SLAVE_MYPORT/federated/t1';
+  CONNECTION='mysql://root@127.0.0.1:$SLAVE_MYPORT/federated/t1';
 
 INSERT INTO federated.t1 (name, other) VALUES ('First Name', 11111);
 INSERT INTO federated.t1 (name, other) VALUES ('Second Name', NULL);
@@ -333,7 +333,7 @@ eval CREATE TABLE federated.t1 (
     KEY nameoth (name, other))
   ENGINE="FEDERATED" DEFAULT
   CHARSET=latin1
-  COMMENT='mysql://root@127.0.0.1:$SLAVE_MYPORT/federated/t1';
+  CONNECTION='mysql://root@127.0.0.1:$SLAVE_MYPORT/federated/t1';
 
 INSERT INTO federated.t1 (name, other) VALUES ('First Name', '1111');
 INSERT INTO federated.t1 (name, other) VALUES ('Second Name', '2222');
@@ -372,7 +372,7 @@ eval CREATE TABLE federated.t1 (
     KEY floatval(floatval))
   ENGINE="FEDERATED"
   DEFAULT CHARSET=latin1
-  COMMENT='mysql://root@127.0.0.1:$SLAVE_MYPORT/federated/t1';
+  CONNECTION='mysql://root@127.0.0.1:$SLAVE_MYPORT/federated/t1';
 
 INSERT INTO federated.t1 (name, bincol, floatval, other) 
   VALUES ('first', 0x65, 11.11, 1111);
@@ -421,7 +421,7 @@ eval CREATE TABLE federated.t1 (
   key col3(col3),
   key col4(col4))
   ENGINE="FEDERATED"
-  COMMENT='mysql://root@127.0.0.1:$SLAVE_MYPORT/federated/t1';
+  CONNECTION='mysql://root@127.0.0.1:$SLAVE_MYPORT/federated/t1';
 
 INSERT INTO federated.t1 (col1, col2, col3, col4) 
   VALUES (1, 'one One', 11, 1111);
@@ -515,7 +515,7 @@ eval CREATE TABLE federated.t1 (
   key 2key (`col3`,`col4`),
   key col4(col4))
   ENGINE="FEDERATED"
-  COMMENT='mysql://root@127.0.0.1:$SLAVE_MYPORT/federated/t1';
+  CONNECTION='mysql://root@127.0.0.1:$SLAVE_MYPORT/federated/t1';
 
 INSERT INTO federated.t1 (col1, col2, col3, col4) 
   VALUES ('aaaa', 'aaaaaaaaaaaaaaaaaaa', 'ababababab', 'acacacacacacacac');
@@ -567,7 +567,7 @@ eval CREATE TABLE federated.t1 (
   primary key (`col1`, `col2`, `col3`))
   ENGINE="FEDERATED"
   DEFAULT CHARSET=latin1
-  COMMENT='mysql://root@127.0.0.1:$SLAVE_MYPORT/federated/t1';
+  CONNECTION='mysql://root@127.0.0.1:$SLAVE_MYPORT/federated/t1';
 
 INSERT INTO federated.t1 VALUES ('a00', '110', 'cc0');
 INSERT INTO federated.t1 VALUES ('aaa', '111', 'ccc');
@@ -606,7 +606,7 @@ eval CREATE TABLE federated.t1 (
     `other` int)
 ENGINE="FEDERATED"
 DEFAULT CHARSET=latin1
-COMMENT='mysql://root@127.0.0.1:$SLAVE_MYPORT/federated/t1';
+CONNECTION='mysql://root@127.0.0.1:$SLAVE_MYPORT/federated/t1';
 
 # these both should be the same
 INSERT INTO federated.t1 values (NULL, NULL, NULL, NULL);
@@ -640,7 +640,7 @@ eval CREATE TABLE federated.t1 (
     PRIMARY KEY (blurb_id))
   ENGINE="FEDERATED"
   DEFAULT CHARSET=latin1
-  COMMENT='mysql://root@127.0.0.1:$SLAVE_MYPORT/federated/t1'; 
+  CONNECTION='mysql://root@127.0.0.1:$SLAVE_MYPORT/federated/t1'; 
 
 INSERT INTO federated.t1 VALUES (1, " MySQL supports a number of column types in several categories: numeric types, date and time types, and string (character) types.  This chapter first gives an overview of these column types, and then provides a more detailed description of the properties of the types in each category, and a summary of the column type storage requirements.  The overview is intentionally brief.  The more detailed descriptions should be consulted for additional information about particular column types, such as the allowable formats in which you can specify values.");
 INSERT INTO federated.t1 VALUES (2, "All arithmetic is done using signed BIGINT or DOUBLE values, so you should not use unsigned big integers larger than 9223372036854775807 (63 bits) except with bit functions! If you do that, some of the last digits in the result may be wrong because of rounding errors when converting a BIGINT value to a DOUBLE.");
@@ -667,7 +667,7 @@ eval CREATE TABLE federated.t1 (
     KEY (b))
   ENGINE="FEDERATED"
   DEFAULT CHARSET=latin1
-  COMMENT='mysql://root@127.0.0.1:$SLAVE_MYPORT/federated/t1';
+  CONNECTION='mysql://root@127.0.0.1:$SLAVE_MYPORT/federated/t1';
 
 INSERT INTO federated.t1 VALUES (3,3,3),(1,1,1),(2,2,2),(4,4,4);
 
@@ -931,7 +931,7 @@ int, i999 int, i1000 int, b varchar(256))
 row_format=dynamic
 ENGINE="FEDERATED"
 DEFAULT CHARSET=latin1
-COMMENT='mysql://root@127.0.0.1:$SLAVE_MYPORT/federated/t1';
+CONNECTION='mysql://root@127.0.0.1:$SLAVE_MYPORT/federated/t1';
 
 INSERT INTO federated.t1
 values (1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
@@ -1000,7 +1000,7 @@ eval CREATE TABLE federated.t1 (
     index(code),
     index(fileguts(10)))
   ENGINE="FEDERATED" DEFAULT CHARSET=latin1
-  COMMENT='mysql://root@127.0.0.1:$SLAVE_MYPORT/federated/t1'; 
+  CONNECTION='mysql://root@127.0.0.1:$SLAVE_MYPORT/federated/t1'; 
 INSERT INTO federated.t1 (code, fileguts, creation_date) VALUES ('ASDFWERQWETWETAWETA', '*()w*09*$()*#)(*09*^90*d)(*s()d8g)(s*ned)(*)(s*d)(*hn(d*)(*sbn)D((#$*(#*%%&#&^$#&#&#&#&^&#*&*#$*&^*(&#(&Q*&&(*!&!(*&*(#&*(%&#<S-F8>*<S-F8><S-F8><S-F8>#<S-F8>#<S-F8>#<S-F8>[[', '2003-03-03 03:03:03');
 INSERT INTO federated.t1 (code, fileguts, creation_date) VALUES ('DEUEUEUEUEUEUEUEUEU', '*()w*09*$()*#)(*09*^90*d)(*s()d8g)(s*ned)(*)(s*d)(*hn(d*)(*sbn)D((#$*(#*%%&#&^$#&#&#&#&^&#*&*#$*&^*(&#(&Q*&&(*!&!(*&*(#&*(%&#<S-F8>*<S-F8><S-F8><S-F8>#<S-F8>#<S-F8>#<S-F8>[[', '2004-04-04 04:04:04');
 INSERT INTO federated.t1 (code, fileguts, creation_date) VALUES ('DEUEUEUEUEUEUEUEUEU', 'jimbob', '2004-04-04 04:04:04');
@@ -1019,7 +1019,7 @@ DROP TABLE IF EXISTS federated.t1;
 eval CREATE TABLE federated.t1 (
   `a` BLOB)
 ENGINE="FEDERATED"
-COMMENT='mysql://root@127.0.0.1:$SLAVE_MYPORT/federated/t1';
+CONNECTION='mysql://root@127.0.0.1:$SLAVE_MYPORT/federated/t1';
 
 INSERT INTO federated.t1 VALUES (0x00);
 INSERT INTO federated.t1 VALUES (0x0001);
@@ -1031,7 +1031,7 @@ SELECT HEX(a) FROM federated.t1;
 # --replace_result $SLAVE_MYPORT SLAVE_PORT
 # eval CREATE TABLE federated.t1
 #  (a char(20)) charset=cp1251
-#  ENGINE="FEDERATED" COMMENT="mysql://root@127.0.0.1:$SLAVE_MYPORT/federated/t1";
+#  ENGINE="FEDERATED" CONNECTION="mysql://root@127.0.0.1:$SLAVE_MYPORT/federated/t1";
 # # 
 #  connection slave;
 # DROP TABLE IF EXISTS federated.t1;
@@ -1093,7 +1093,7 @@ eval CREATE TABLE federated.t1 (
     PRIMARY KEY  (`id`),
     KEY (country_id) )
   ENGINE="FEDERATED" DEFAULT CHARSET=latin1
-  COMMENT='mysql://root@127.0.0.1:$SLAVE_MYPORT/federated/t1';
+  CONNECTION='mysql://root@127.0.0.1:$SLAVE_MYPORT/federated/t1';
 
 INSERT INTO federated.t1 (name, country_id, other) VALUES ('Kumar', 1, 11111);
 INSERT INTO federated.t1 (name, country_id, other) VALUES ('Lenz', 2, 22222);