Moving the code checking libxml2 into a *.inc file.

storage/connect/mysql-test/connect/t/have_libxml2.inc

+--disable_query_log
+--error 0,ER_UNKNOWN_ERROR
+CREATE TABLE t1 (a VARCHAR(10))
+ENGINE=CONNECT TABLE_TYPE=XML OPTION_LIST='xmlsup=libxml2';
+if (!`SELECT count(*) FROM INFORMATION_SCHEMA.TABLES
+     WHERE TABLE_SCHEMA='test' AND TABLE_NAME='t1'
+     AND ENGINE='CONNECT'
+     AND CREATE_OPTIONS LIKE '%`table_type`=XML%'
+     AND CREATE_OPTIONS LIKE '%xmlsup=libxml2%'`)
+{
+  DROP TABLE IF EXISTS t1;
+  Skip Need LIBXML2;
+}
+DROP TABLE t1;
+--enable_query_log
+
+

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

---disable_query_log
---error 0,ER_UNKNOWN_ERROR
-CREATE TABLE t1 (a VARCHAR(10))
-ENGINE=CONNECT TABLE_TYPE=XML OPTION_LIST='xmlsup=libxml2';
-if (!`SELECT count(*) FROM INFORMATION_SCHEMA.TABLES
-     WHERE TABLE_SCHEMA='test' AND TABLE_NAME='t1'
-     AND ENGINE='CONNECT'
-     AND CREATE_OPTIONS LIKE '%`table_type`=XML%'
-     AND CREATE_OPTIONS LIKE '%xmlsup=libxml2%'`)
-{
-  Skip Need LIBXML2;
-}
-DROP TABLE t1;
---enable_query_log
-
+--source have_libxml2.inc
 
 let $MYSQLD_DATADIR= `select @@datadir`;
 

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

 -- source include/not_embedded.inc
-
---disable_query_log
---error 0,ER_UNKNOWN_ERROR
-CREATE TABLE t1 (a VARCHAR(10))
-ENGINE=CONNECT TABLE_TYPE=XML OPTION_LIST='xmlsup=libxml2';
-if (!`SELECT count(*) FROM INFORMATION_SCHEMA.TABLES
-     WHERE TABLE_SCHEMA='test' AND TABLE_NAME='t1'
-     AND ENGINE='CONNECT'
-     AND CREATE_OPTIONS LIKE '%`table_type`=XML%'
-     AND CREATE_OPTIONS LIKE '%xmlsup=libxml2%'`)
-{
-  Skip Need LIBXML2;
-}
-DROP TABLE t1;
---enable_query_log
-
+-- source have_libxml2.inc
 
 let $MYSQLD_DATADIR= `select @@datadir`;
 

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

---disable_query_log
---error 0,ER_UNKNOWN_ERROR
-CREATE TABLE t1 (a VARCHAR(10))
-ENGINE=CONNECT TABLE_TYPE=XML OPTION_LIST='xmlsup=libxml2';
-if (!`SELECT count(*) FROM INFORMATION_SCHEMA.TABLES
-     WHERE TABLE_SCHEMA='test' AND TABLE_NAME='t1'
-     AND ENGINE='CONNECT'
-     AND CREATE_OPTIONS LIKE '%`table_type`=XML%'
-     AND CREATE_OPTIONS LIKE '%xmlsup=libxml2%'`)
-{
-  Skip Need LIBXML2;
-}
-DROP TABLE t1;
---enable_query_log
+--source have_libxml2.inc
 
 let $MYSQLD_DATADIR= `select @@datadir`;