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

* remove is_embedded.require

mysql-test/include/is_embedded.inc

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

mysql-test/r/is_embedded.require

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

mysql-test/suite/funcs_1/t/is_columns_is_embedded.test

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