Try to fix failing tests on LINUX

  modified:   storage/connect/mysql-test/connect/r/alter_xml2.result
  modified:   storage/connect/mysql-test/connect/r/infoschema2-9739.result
  modified:   storage/connect/mysql-test/connect/r/xml2_grant.result
  modified:   storage/connect/mysql-test/connect/r/xml2_mdev5261.result
  modified:   storage/connect/mysql-test/connect/r/xml_mdev5261.result
  modified:   storage/connect/mysql-test/connect/t/xml2_mdev5261.test
  modified:   storage/connect/mysql-test/connect/t/xml_mdev5261.test

storage/connect/mysql-test/connect/r/infoschema2-9739.result

 Warnings:
 Warning	1105	No file name. Table will use t1.xml
-create table t1 (i int) engine=Connect table_type=XML option_list='xmlsup=libxml2';
+create table t1 (i int) engine=Connect table_type=XML option_list='xmlsup=libxml2;
 Warnings:
 Warning	1105	No file name. Table will use t1.xml
 select * from information_schema.tables where create_options like '%table_type=XML%';

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

@@ -6,6 +6,8 @@ Warning	1105	No file name. Table will use t1.xml
 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
@@ -34,11 +36,13 @@ 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
@@ -61,10 +65,12 @@ 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
@@ -76,6 +82,7 @@ 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
@@ -85,12 +92,15 @@ CREATE TABLE t1 (a INT NOT NULL) ENGINE=CONNECT TABLE_TYPE=XML OPTION_LIST='xmls
 Warnings:
 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
 SET NAMES utf8;
-CREATE TABLE t1 (i INT UNIQUE NOT NULL) ENGINE=CONNECT TABLE_TYPE=XML FILE_NAME='xt1.xml' OPTION_LIST='Rownode=N';
+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='Rownode=N';
+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	

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

 SET NAMES utf8;
-CREATE TABLE t1 (i INT UNIQUE NOT NULL) ENGINE=CONNECT TABLE_TYPE=XML FILE_NAME='xt1.xml' OPTION_LIST='Rownode=N';
+CREATE TABLE t1 (i INT UNIQUE NOT NULL) ENGINE=CONNECT TABLE_TYPE=XML FILE_NAME='xt1.xml' OPTION_LIST='xmlsup=domdoc,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='Rownode=N';
+CREATE TABLE t1 (i INT NOT NULL) ENGINE=CONNECT TABLE_TYPE=XML FILE_NAME='xt1.xml' OPTION_LIST='xmlsup=domdoc,Rownode=N';
 DESCRIBE t1;
 Field	Type	Null	Key	Default	Extra
 i	int(11)	NO		NULL	

storage/connect/mysql-test/connect/t/xml2_mdev5261.test

@@ -8,8 +8,8 @@ SET NAMES utf8;
 #--echo Testing indexing on not indexable table type
 #
 --error ER_UNKNOWN_ERROR
-CREATE TABLE t1 (i INT UNIQUE NOT NULL) ENGINE=CONNECT TABLE_TYPE=XML FILE_NAME='xt1.xml' OPTION_LIST='Rownode=N';
-CREATE TABLE t1 (i INT NOT NULL) ENGINE=CONNECT TABLE_TYPE=XML FILE_NAME='xt1.xml' OPTION_LIST='Rownode=N';
+CREATE TABLE t1 (i INT UNIQUE NOT NULL) ENGINE=CONNECT TABLE_TYPE=XML FILE_NAME='xt1.xml' OPTION_LIST='xmlsup=libxml2,Rownode=N';
+CREATE TABLE t1 (i INT NOT NULL) ENGINE=CONNECT TABLE_TYPE=XML FILE_NAME='xt1.xml' OPTION_LIST='xmlsup=libxml2,Rownode=N';
 DESCRIBE t1;
 # one could *add* an index to an existing table
 --error ER_UNKNOWN_ERROR

storage/connect/mysql-test/connect/t/xml_mdev5261.test

@@ -8,8 +8,8 @@ SET NAMES utf8;
 #--echo Testing indexing on not indexable table type
 #
 --error ER_UNKNOWN_ERROR
-CREATE TABLE t1 (i INT UNIQUE NOT NULL) ENGINE=CONNECT TABLE_TYPE=XML FILE_NAME='xt1.xml' OPTION_LIST='Rownode=N';
-CREATE TABLE t1 (i INT NOT NULL) ENGINE=CONNECT TABLE_TYPE=XML FILE_NAME='xt1.xml' OPTION_LIST='Rownode=N';
+CREATE TABLE t1 (i INT UNIQUE NOT NULL) ENGINE=CONNECT TABLE_TYPE=XML FILE_NAME='xt1.xml' OPTION_LIST='xmlsup=domdoc,Rownode=N';
+CREATE TABLE t1 (i INT NOT NULL) ENGINE=CONNECT TABLE_TYPE=XML FILE_NAME='xt1.xml' OPTION_LIST='xmlsup=domdoc,Rownode=N';
 DESCRIBE t1;
 # one could *add* an index to an existing table
 --error ER_UNKNOWN_ERROR