WL# 3031

Post-commit issues fixed
* Test results for other tests fixed due to added error #s
* Memory allocation/free issues found with running with valgrind
* Fix to mysql-test-run shell script to run federated_server test (installs
mysql.servers table properly)


mysql-test/r/1st.result:
  WL #3031
  
  New result for 1st test
mysql-test/r/backup.result:
  WL #3031
  
  Error codes differ due to addition of error codes for federated server errors (2)
  so all test results with hard-coded error #s will be off by two. New results generated.
mysql-test/r/connect.result:
  WL #3031
  
  Error codes differ due to addition of error codes for federated server errors (2)
  so all test results with hard-coded error #s will be off by two. New results generated.
mysql-test/r/information_schema.result:
  WL #3031
  
  Error codes differ due to addition of error codes for federated server errors (2)
  so all test results with hard-coded error #s will be off by two. New results generated.
mysql-test/r/mysql.result:
  WL #3031
  
  Error codes differ due to addition of error codes for federated server errors (2)
  so all test results with hard-coded error #s will be off by two. New results generated.
mysql-test/r/mysqlcheck.result:
  WL #3031
  
  Error codes differ due to addition of error codes for federated server errors (2)
  so all test results with hard-coded error #s will be off by two. New results generated.
mysql-test/r/ndb_dd_basic.result:
  WL #3031
  
  Error codes differ due to addition of error codes for federated server errors (2)
  so all test results with hard-coded error #s will be off by two. New results generated.
mysql-test/r/ndb_dd_ddl.result:
  WL #3031
  
  Error codes differ due to addition of error codes for federated server errors (2)
  so all test results with hard-coded error #s will be off by two. New results generated.
mysql-test/r/select.result:
  WL #3031
  
  Error codes differ due to addition of error codes for federated server errors (2)
  so all test results with hard-coded error #s will be off by two. New results generated.
mysql-test/r/show_check.result:
  WL #3031
  
  Error codes differ due to addition of error codes for federated server errors (2)
  so all test results with hard-coded error #s will be off by two. New results generated.
mysql-test/r/sp.result:
  WL #3031
  
  Error codes differ due to addition of error codes for federated server errors (2)
  so all test results with hard-coded error #s will be off by two. New results generated.
mysql-test/r/sp_gis.result:
  WL #3031
  
  Error codes differ due to addition of error codes for federated server errors (2)
  so all test results with hard-coded error #s will be off by two. New results generated.
mysql-test/r/sp_trans.result:
  WL #3031
  
  Error codes differ due to addition of error codes for federated server errors (2)
  so all test results with hard-coded error #s will be off by two. New results generated.
mysql-test/r/system_mysql_db.result:
  WL #3031
  
  Error codes differ due to addition of error codes for federated server errors (2)
  so all test results with hard-coded error #s will be off by two. New results generated.
mysql-test/r/type_timestamp.result:
  WL #3031
  
  Error codes differ due to addition of error codes for federated server errors (2)
  so all test results with hard-coded error #s will be off by two. New results generated.
mysql-test/r/warnings.result:
  WL #3031
  
  Error codes differ due to addition of error codes for federated server errors (2)
  so all test results with hard-coded error #s will be off by two. New results generated.
mysql-test/r/xml.result:
  WL #3031
  
  Error codes differ due to addition of error codes for federated server errors (2)
  so all test results with hard-coded error #s will be off by two. New results generated.
scripts/mysql_create_system_tables.sh:
  WL #3031
  
  Fixed old mysql-test-run.sh script to work with new mysql.servers table as reported
  by Cisco
sql/sql_yacc.yy:
  WL# 3031
  
  OPTIONS/options must be usable as table or column name.
storage/federated/ha_federated.cc:
  WL# 3031
  
  * Fixed allocation and free issues (warnings found with --valgrind)
  * Fixed cast issues
  * Made sure port was set accordingly

1 files changed, 18 insertions, 14 deletions

diff --git a/scripts/mysql_create_system_tables.sh b/scripts/mysql_create_system_tables.sh
index d0a93f29008..28be2c95290 100644
--- a/scripts/mysql_create_system_tables.sh
+++ b/scripts/mysql_create_system_tables.sh
@@ -30,6 +30,7 @@ windows=$4
 
 # Initialize variables
 c_d="" i_d=""
+c_s="" i_s=""
 c_h="" i_h=""
 c_u="" i_u=""
 c_f="" i_f=""
@@ -199,21 +200,21 @@ then
   echo "Preparing servers table" 1>&2;
   fi
 
-  c_d="$c_d
-
+  c_s="
 CREATE TABLE  servers ("
-  c_d="$c_d   Server_name char(64) NOT NULL,"
-  c_d="$c_d   Hostname char(64) NOT NULL,"
-  c_d="$c_d   Db char(64) NOT NULL,"
-  c_d="$c_d   Username char(64) NOT NULL,"
-  c_d="$c_d   Passwd char(64) NOT NULL,"
-  c_d="$c_d   Portnum INT(4),"
-  c_d="$c_d   Sock char(64),"
-  c_d="$c_d   Scheme char(64) NOT NULL,"
-  c_d="$c_d   Owner char(64) NOT NULL,"
-  c_d="$c_d   PRIMARY KEY  (Server_name));"
-
-  i_d="INSERT INTO servers VALUES
+  c_s="$c_s   Server_name char(64) NOT NULL,"
+  c_s="$c_s   Host char(64) NOT NULL,"
+  c_s="$c_s   Db char(64) NOT NULL,"
+  c_s="$c_s   Username char(64) NOT NULL,"
+  c_s="$c_s   Password char(64) NOT NULL,"
+  c_s="$c_s   Port INT(4),"
+  c_s="$c_s   Socket char(64),"
+  c_s="$c_s   Wrapper char(64) NOT NULL,"
+  c_s="$c_s   Owner char(64) NOT NULL,"
+  c_s="$c_s   PRIMARY KEY  (Server_name))"
+  c_s="$c_s   comment='MySQL Foreign Servers table';"
+
+  i_s="INSERT INTO servers VALUES
     ('test','localhost','test','root','', 0,
      '','mysql','root');
     "
@@ -876,6 +877,9 @@ $i_f
 $c_pl
 $i_pl
 
+$c_s
+$i_s
+
 $c_t
 $c_c