1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* change the test to use is_embedded.inc instead of a direct check

Browse Source 
* remove is_embedded.require
This commit is contained in:
Sergei Golubchik 2013-12-22 17:11:38 +01:00
parent d596ce67c1
commit 902491c397
3 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mysql-test/include/is_embedded.inc
View File

@ -1,5 +1,5 @@
-- require r/is_embedded.require if (`SELECT VERSION() NOT LIKE '%embedded%'`)
disable_query_log; {
select version() like '%embedded%' as 'have_embedded'; --skip Test requires: embedded server
enable_query_log; }

2
mysql-test/r/is_embedded.require
View File

@ -1,2 +0,0 @@
have_embedded
1

8
mysql-test/suite/funcs_1/t/is_columns_is_embedded.test
View File

@ -13,12 +13,8 @@
# 2008-06-06 mleich Create this variant for the embedded server # 2008-06-06 mleich Create this variant for the embedded server
# #
--source include/have_xtradb.inc --source include/have_innodb.inc
--source include/is_embedded.inc
if (`SELECT VERSION() NOT LIKE '%embedded%'`)
{
--skip Test requires: embedded server
}
let $my_where = WHERE table_schema = 'information_schema' let $my_where = WHERE table_schema = 'information_schema'
AND table_name <> 'profiling' AND table_name not like 'innodb_%'; AND table_name <> 'profiling' AND table_name not like 'innodb_%';