- Oops! db was no more initialized in pre-create. Fixed

modified:
  storage/connect/ha_connect.cc
  mysql-test/suite/connect/r/mysql.result  (merged)
  mysql-test/suite/connect/t/mysql.test    (merged)

mysql-test/suite/connect/r/mysql.result

@@ -22,7 +22,7 @@ Table	Create Table
 t2	CREATE TABLE `t2` (
   `x` int(11) DEFAULT NULL,
   `y` char(10) DEFAULT NULL
-) ENGINE=CONNECT DEFAULT CHARSET=latin1 `TABLE_TYPE`=MYSQL `TABNAME`='t1' `OPTION_LIST`='host=localhost,user=root,port=16000'
+) ENGINE=CONNECT DEFAULT CHARSET=latin1 `TABLE_TYPE`=MYSQL `TABNAME`='t1' `OPTION_LIST`='host=localhost,user=root,port=PORT'
 SELECT * FROM t2;
 ERROR HY000: Got error 174 '(1054) Unknown column 'x' in 'field list' [SELECT `x`, `y` FROM `t1`]' from CONNECT
 DROP TABLE t2;

mysql-test/suite/connect/t/mysql.test

@@ -12,7 +12,8 @@ SELECT * FROM t1;
 --echo #
 
 # Bad user name
---replace_result $PORT PORT
+# Suppress "mysql_real_connect failed:" (printed in _DEBUG build)
+--replace_result $PORT PORT "mysql_real_connect failed: " ""
 --error ER_UNKNOWN_ERROR
 --eval CREATE TABLE t2 ENGINE=CONNECT TABLE_TYPE=MYSQL TABNAME='t1' OPTION_LIST='host=localhost,user=root1,port=$PORT'
 
@@ -28,6 +29,7 @@ SHOW CREATE TABLE t2;
 # Bad column name
 --replace_result $PORT PORT
 --eval CREATE TABLE t2 (x int, y char(10)) ENGINE=CONNECT TABLE_TYPE=MYSQL TABNAME='t1' OPTION_LIST='host=localhost,user=root,port=$PORT'
+--replace_result $PORT PORT
 SHOW CREATE TABLE t2;
 --error ER_GET_ERRMSG
 SELECT * FROM t2;

storage/connect/ha_connect.cc

@@ -3344,7 +3344,7 @@ bool ha_connect::pre_create(THD *thd, HA_CREATE_INFO *create_info,
   if (!g)
     return true;
 
-  fn= dsn= tab= host= pwd= prt= sep= NULL;
+  fn= dsn= tab= db= host= pwd= prt= sep= NULL;
   user= NULL;
 
   // Get the useful create options