Fix failing tests. Modified:...

Fix failing tests. Modified: storage/connect/mysql-test/connect/r/xml2_grant.result and storage/connect/mysql-test/connect/r/xml2_mdev5261.result

storage/connect/mysql-test/connect/r/xml2_grant.result

 Warnings:
-Warning	1105	No file name. Table will use t1.xml
+Warning 1105  No file name. Table will use t1.xml
 #
 # Beginning of grant.inc
 #
 CREATE USER user@localhost;
 GRANT ALL PRIVILEGES ON *.* TO user@localhost;
 REVOKE FILE ON *.* FROM user@localhost;
-connect user,localhost,user,,;
-connection user;
 SELECT user();
 user()
 user@localhost
 CREATE TABLE t1 (a INT NOT NULL) ENGINE=CONNECT TABLE_TYPE=XML OPTION_LIST='xmlsup=libxml2,rownode=row';
 Warnings:
-Warning	1105	No file name. Table will use t1.xml
+Warning 1105  No file name. Table will use t1.xml
 INSERT INTO t1 VALUES (10);
 SELECT * FROM t1;
 a
@@ -36,13 +34,11 @@ DROP VIEW v1;
 DROP TABLE t1;
 CREATE TABLE t1 (a INT NOT NULL) ENGINE=CONNECT TABLE_TYPE=XML OPTION_LIST='xmlsup=libxml2,rownode=row' FILE_NAME='t1.EXT';
 ERROR 28000: Access denied for user 'user'@'localhost' (using password: NO)
-connection default;
 SELECT user();
 user()
 root@localhost
 CREATE TABLE t1 (a INT NOT NULL) ENGINE=CONNECT TABLE_TYPE=XML OPTION_LIST='xmlsup=libxml2,rownode=row' FILE_NAME='t1.EXT';
 INSERT INTO t1 VALUES (10);
-connection user;
 SELECT user();
 user()
 user@localhost
@@ -65,12 +61,10 @@ ERROR 28000: Access denied for user 'user'@'localhost' (using password: NO)
 CREATE VIEW v1 AS SELECT * FROM t1;
 ERROR 28000: Access denied for user 'user'@'localhost' (using password: NO)
 # Testing a VIEW created with FILE privileges but accessed with no FILE
-connection default;
 SELECT user();
 user()
 root@localhost
 CREATE SQL SECURITY INVOKER VIEW v1 AS SELECT * FROM t1;
-connection user;
 SELECT user();
 user()
 user@localhost
@@ -82,7 +76,6 @@ UPDATE v1 SET a=123;
 ERROR 28000: Access denied for user 'user'@'localhost' (using password: NO)
 DELETE FROM v1;
 ERROR 28000: Access denied for user 'user'@'localhost' (using password: NO)
-connection default;
 SELECT user();
 user()
 root@localhost
@@ -90,17 +83,14 @@ DROP VIEW v1;
 DROP TABLE t1;
 CREATE TABLE t1 (a INT NOT NULL) ENGINE=CONNECT TABLE_TYPE=XML OPTION_LIST='xmlsup=libxml2,rownode=row';
 Warnings:
-Warning	1105	No file name. Table will use t1.xml
+Warning 1105  No file name. Table will use t1.xml
 INSERT INTO t1 VALUES (10);
-connection user;
 SELECT user();
 user()
 user@localhost
 ALTER TABLE t1 FILE_NAME='t1.EXT';
 ERROR 28000: Access denied for user 'user'@'localhost' (using password: NO)
-connection default;
 DROP TABLE t1;
-disconnect user;
 DROP USER user@localhost;
 #
 # End of grant.inc

storage/connect/mysql-test/connect/r/xml2_mdev5261.result

 Warnings:
-Warning	1105	No file name. Table will use t1.xml
+Warning 1105  No file name. Table will use t1.xml
 SET NAMES utf8;
 CREATE TABLE t1 (i INT UNIQUE NOT NULL) ENGINE=CONNECT TABLE_TYPE=XML FILE_NAME='xt1.xml' OPTION_LIST='xmlsup=libxml2,Rownode=N';
 ERROR HY000: Table type XML is not indexable
 CREATE TABLE t1 (i INT NOT NULL) ENGINE=CONNECT TABLE_TYPE=XML FILE_NAME='xt1.xml' OPTION_LIST='xmlsup=libxml2,Rownode=N';
 DESCRIBE t1;
-Field	Type	Null	Key	Default	Extra
-i	int(11)	NO		NULL	
+Field Type  Null  Key Default Extra
+i int(11) NO    NULL
 ALTER TABLE t1 ADD UNIQUE(i);
 ERROR HY000: Table type XML is not indexable
 CREATE UNIQUE INDEX i ON t1(i);
 ERROR HY000: Table type XML is not indexable
 DESCRIBE t1;
-Field	Type	Null	Key	Default	Extra
-i	int(11)	NO		NULL	
+Field Type  Null  Key Default Extra
+i int(11) NO    NULL
 INSERT INTO t1 VALUES(2),(5),(7);
 SELECT * FROM t1 WHERE i = 5;
 i
 5
 ALTER TABLE t1 DROP INDEX i;
-ERROR 42000: Can't DROP INDEX `i`; check that it exists
+ERROR 42000: Can't DROP 'i'; check that column/key exists
 DROP INDEX i ON t1;
-ERROR 42000: Can't DROP INDEX `i`; check that it exists
+ERROR 42000: Can't DROP 'i'; check that column/key exists
 DROP TABLE t1;