mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 20:12:31 +01:00
Moving the code checking libxml2 into a *.inc file.
This commit is contained in:
parent
1e1345c451
commit
57fcf1cbe4
4 changed files with 20 additions and 45 deletions
17
storage/connect/mysql-test/connect/t/have_libxml2.inc
Normal file
17
storage/connect/mysql-test/connect/t/have_libxml2.inc
Normal file
|
@ -0,0 +1,17 @@
|
|||
--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
|
||||
|
||||
|
|
@ -1,18 +1,4 @@
|
|||
--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`;
|
||||
|
||||
|
|
|
@ -1,20 +1,5 @@
|
|||
-- 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`;
|
||||
|
||||
|
|
|
@ -1,17 +1,4 @@
|
|||
--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`;
|
||||
|
||||
|
|
Loading…
Reference in a new issue