skip test if target engine is not available

storage/spider/mysql-test/spider/bg/t/basic_sql.test

 # This test tests by executing basic SQL
+--let $SKIP_REASON=
 --disable_warnings
 --disable_query_log
 --disable_result_log
@@ -25,6 +26,28 @@ if ($USE_CHILD_GROUP2)
 }
 --enable_warnings
 
+if ($SKIP_REASON)
+{
+  --echo deinit
+  --disable_warnings
+  --connection master_1
+  DROP DATABASE IF EXISTS auto_test_local;
+  if ($USE_CHILD_GROUP2)
+  {
+    --connection child2_1
+    DROP DATABASE IF EXISTS auto_test_remote;
+    --connection child2_2
+    DROP DATABASE IF EXISTS auto_test_remote2;
+  }
+  --disable_query_log
+  --disable_result_log
+  --source test_deinit.inc
+  --enable_result_log
+  --enable_query_log
+  --enable_warnings
+  --skip $SKIP_REASON
+}
+
 --echo
 --echo test select 1
 --connection master_1

storage/spider/mysql-test/spider/bg/t/direct_aggregate.test

+--let $SKIP_REASON=
 --disable_warnings
 --disable_query_log
 --disable_result_log
@@ -24,6 +25,28 @@ if ($USE_CHILD_GROUP2)
 }
 --enable_warnings
 
+if ($SKIP_REASON)
+{
+  --echo deinit
+  --disable_warnings
+  --connection master_1
+  DROP DATABASE IF EXISTS auto_test_local;
+  if ($USE_CHILD_GROUP2)
+  {
+    --connection child2_1
+    DROP DATABASE IF EXISTS auto_test_remote;
+    --connection child2_2
+    DROP DATABASE IF EXISTS auto_test_remote2;
+  }
+  --disable_query_log
+  --disable_result_log
+  --source test_deinit.inc
+  --enable_result_log
+  --enable_query_log
+  --enable_warnings
+  --skip $SKIP_REASON
+}
+
 --echo
 --echo test select 1
 --connection master_1

storage/spider/mysql-test/spider/bg/t/direct_update.test

+--let $SKIP_REASON=
 --disable_warnings
 --disable_query_log
 --disable_result_log
@@ -24,6 +25,28 @@ if ($USE_CHILD_GROUP2)
 }
 --enable_warnings
 
+if ($SKIP_REASON)
+{
+  --echo deinit
+  --disable_warnings
+  --connection master_1
+  DROP DATABASE IF EXISTS auto_test_local;
+  if ($USE_CHILD_GROUP2)
+  {
+    --connection child2_1
+    DROP DATABASE IF EXISTS auto_test_remote;
+    --connection child2_2
+    DROP DATABASE IF EXISTS auto_test_remote2;
+  }
+  --disable_query_log
+  --disable_result_log
+  --source test_deinit.inc
+  --enable_result_log
+  --enable_query_log
+  --enable_warnings
+  --skip $SKIP_REASON
+}
+
 --echo
 --echo test select 1
 --connection master_1

storage/spider/mysql-test/spider/bg/t/function.test

 # This test tests for using functions
+--let $SKIP_REASON=
 --disable_warnings
 --disable_query_log
 --disable_result_log
@@ -25,6 +26,28 @@ if ($USE_CHILD_GROUP2)
 }
 --enable_warnings
 
+if ($SKIP_REASON)
+{
+  --echo deinit
+  --disable_warnings
+  --connection master_1
+  DROP DATABASE IF EXISTS auto_test_local;
+  if ($USE_CHILD_GROUP2)
+  {
+    --connection child2_1
+    DROP DATABASE IF EXISTS auto_test_remote;
+    --connection child2_2
+    DROP DATABASE IF EXISTS auto_test_remote2;
+  }
+  --disable_query_log
+  --disable_result_log
+  --source test_deinit.inc
+  --enable_result_log
+  --enable_query_log
+  --enable_warnings
+  --skip $SKIP_REASON
+}
+
 --echo
 --echo test select 1
 --connection master_1

storage/spider/mysql-test/spider/bg/t/ha.test

 # This test tests for ha features
+--let $SKIP_REASON=
 if ($USE_HA_TEST)
 {
 --disable_warnings
@@ -47,6 +48,40 @@ if ($USE_CHILD_GROUP3)
 }
 --enable_warnings
 
+if ($SKIP_REASON)
+{
+  --echo deinit
+  --disable_warnings
+  --connection master_1
+  DROP DATABASE IF EXISTS auto_test_local;
+  if ($USE_CHILD_GROUP2)
+  {
+    --connection child2_1
+    DROP DATABASE IF EXISTS auto_test_remote;
+    --connection child2_2
+    DROP DATABASE IF EXISTS auto_test_remote2;
+    --connection child2_3
+    DROP DATABASE IF EXISTS auto_test_remote3;
+  }
+  if ($USE_CHILD_GROUP3)
+  {
+    --connection child3_1
+    DROP DATABASE IF EXISTS auto_test_local;
+    --connection child3_2
+    DROP DATABASE IF EXISTS auto_test_local;
+    --connection child3_3
+    DROP DATABASE IF EXISTS auto_test_local;
+  }
+  --disable_query_log
+  --disable_result_log
+  --source ha_test_deinit.inc
+  --source test_deinit.inc
+  --enable_result_log
+  --enable_query_log
+  --enable_warnings
+  --skip $SKIP_REASON
+}
+
 --echo
 --echo test select 1
 --connection master_1

storage/spider/mysql-test/spider/bg/t/have_engine.inc

@@ -3,6 +3,5 @@ if (!`SELECT count(*) FROM information_schema.engines WHERE
       engine = '$TEST_ENGINE_TYPE'`)
 {
   SELECT engine, support FROM information_schema.engines;
-  --echo Need $TEST_ENGINE_TYPE engine
-  skip Need $TEST_ENGINE_TYPE engine;
+  --let $SKIP_REASON= "Need $TEST_ENGINE_TYPE engine"
 }

storage/spider/mysql-test/spider/bg/t/have_func.inc

 if (!`SELECT count(*) FROM mysql.func WHERE name = '$TEST_FUNC_NAME'`)
 {
   SELECT name FROM mysql.func;
-  --echo Need $TEST_FUNC_NAME function
-  skip Need $TEST_FUNC_NAME function;
+  --let $SKIP_REASON= "Need $TEST_FUNC_NAME function"
 }

storage/spider/mysql-test/spider/bg/t/spider_fixes.test

 # This test tests for Spider's bug fixes
+--let $SKIP_REASON=
 source include/have_log_bin.inc;
 --disable_warnings
 --disable_query_log
@@ -34,6 +35,34 @@ if ($USE_CHILD_GROUP2)
 }
 --enable_warnings
 
+if ($SKIP_REASON)
+{
+  --echo deinit
+  --disable_warnings
+  --connection master_1
+  DROP DATABASE IF EXISTS auto_test_local;
+  if ($USE_REPLICATION)
+  {
+    --connection slave1_1
+    DROP DATABASE IF EXISTS auto_test_local;
+  }
+  if ($USE_CHILD_GROUP2)
+  {
+    --connection child2_1
+    DROP DATABASE IF EXISTS auto_test_remote;
+    --connection child2_2
+    DROP DATABASE IF EXISTS auto_test_remote2;
+  }
+  --disable_query_log
+  --disable_result_log
+  --source slave_test_deinit.inc
+  --source test_deinit.inc
+  --enable_result_log
+  --enable_query_log
+  --enable_warnings
+  --skip $SKIP_REASON
+}
+
 --echo
 --echo test select 1
 --connection master_1

storage/spider/mysql-test/spider/bg/t/vp_fixes.test

 # This test tests for VP's bug fixes
+--let $SKIP_REASON=
 --disable_warnings
 --disable_query_log
 --disable_result_log
@@ -25,6 +26,28 @@ if ($USE_CHILD_GROUP2)
 }
 --enable_warnings
 
+if ($SKIP_REASON)
+{
+  --echo deinit
+  --disable_warnings
+  --connection master_1
+  DROP DATABASE IF EXISTS auto_test_local;
+  if ($USE_CHILD_GROUP2)
+  {
+    --connection child2_1
+    DROP DATABASE IF EXISTS auto_test_remote;
+    --connection child2_2
+    DROP DATABASE IF EXISTS auto_test_remote2;
+  }
+  --disable_query_log
+  --disable_result_log
+  --source test_deinit.inc
+  --enable_result_log
+  --enable_query_log
+  --enable_warnings
+  --skip $SKIP_REASON
+}
+
 --echo
 --echo test select 1
 --connection master_1

storage/spider/mysql-test/spider/handler/t/basic_sql.test

 # This test tests by executing basic SQL
+--let $SKIP_REASON=
 --disable_warnings
 --disable_query_log
 --disable_result_log
@@ -25,6 +26,28 @@ if ($USE_CHILD_GROUP2)
 }
 --enable_warnings
 
+if ($SKIP_REASON)
+{
+  --echo deinit
+  --disable_warnings
+  --connection master_1
+  DROP DATABASE IF EXISTS auto_test_local;
+  if ($USE_CHILD_GROUP2)
+  {
+    --connection child2_1
+    DROP DATABASE IF EXISTS auto_test_remote;
+    --connection child2_2
+    DROP DATABASE IF EXISTS auto_test_remote2;
+  }
+  --disable_query_log
+  --disable_result_log
+  --source test_deinit.inc
+  --enable_result_log
+  --enable_query_log
+  --enable_warnings
+  --skip $SKIP_REASON
+}
+
 --echo
 --echo test select 1
 --connection master_1

storage/spider/mysql-test/spider/handler/t/direct_aggregate.test

+--let $SKIP_REASON=
 --disable_warnings
 --disable_query_log
 --disable_result_log
@@ -24,6 +25,28 @@ if ($USE_CHILD_GROUP2)
 }
 --enable_warnings
 
+if ($SKIP_REASON)
+{
+  --echo deinit
+  --disable_warnings
+  --connection master_1
+  DROP DATABASE IF EXISTS auto_test_local;
+  if ($USE_CHILD_GROUP2)
+  {
+    --connection child2_1
+    DROP DATABASE IF EXISTS auto_test_remote;
+    --connection child2_2
+    DROP DATABASE IF EXISTS auto_test_remote2;
+  }
+  --disable_query_log
+  --disable_result_log
+  --source test_deinit.inc
+  --enable_result_log
+  --enable_query_log
+  --enable_warnings
+  --skip $SKIP_REASON
+}
+
 --echo
 --echo test select 1
 --connection master_1

storage/spider/mysql-test/spider/handler/t/direct_update.test

+--let $SKIP_REASON=
 --disable_warnings
 --disable_query_log
 --disable_result_log
@@ -24,6 +25,28 @@ if ($USE_CHILD_GROUP2)
 }
 --enable_warnings
 
+if ($SKIP_REASON)
+{
+  --echo deinit
+  --disable_warnings
+  --connection master_1
+  DROP DATABASE IF EXISTS auto_test_local;
+  if ($USE_CHILD_GROUP2)
+  {
+    --connection child2_1
+    DROP DATABASE IF EXISTS auto_test_remote;
+    --connection child2_2
+    DROP DATABASE IF EXISTS auto_test_remote2;
+  }
+  --disable_query_log
+  --disable_result_log
+  --source test_deinit.inc
+  --enable_result_log
+  --enable_query_log
+  --enable_warnings
+  --skip $SKIP_REASON
+}
+
 --echo
 --echo test select 1
 --connection master_1

storage/spider/mysql-test/spider/handler/t/function.test

 # This test tests for using functions
+--let $SKIP_REASON=
 --disable_warnings
 --disable_query_log
 --disable_result_log
@@ -25,6 +26,28 @@ if ($USE_CHILD_GROUP2)
 }
 --enable_warnings
 
+if ($SKIP_REASON)
+{
+  --echo deinit
+  --disable_warnings
+  --connection master_1
+  DROP DATABASE IF EXISTS auto_test_local;
+  if ($USE_CHILD_GROUP2)
+  {
+    --connection child2_1
+    DROP DATABASE IF EXISTS auto_test_remote;
+    --connection child2_2
+    DROP DATABASE IF EXISTS auto_test_remote2;
+  }
+  --disable_query_log
+  --disable_result_log
+  --source test_deinit.inc
+  --enable_result_log
+  --enable_query_log
+  --enable_warnings
+  --skip $SKIP_REASON
+}
+
 --echo
 --echo test select 1
 --connection master_1

storage/spider/mysql-test/spider/handler/t/ha.test

 # This test tests for ha features
+--let $SKIP_REASON=
 if ($USE_HA_TEST)
 {
 --disable_warnings
@@ -47,6 +48,40 @@ if ($USE_CHILD_GROUP3)
 }
 --enable_warnings
 
+if ($SKIP_REASON)
+{
+  --echo deinit
+  --disable_warnings
+  --connection master_1
+  DROP DATABASE IF EXISTS auto_test_local;
+  if ($USE_CHILD_GROUP2)
+  {
+    --connection child2_1
+    DROP DATABASE IF EXISTS auto_test_remote;
+    --connection child2_2
+    DROP DATABASE IF EXISTS auto_test_remote2;
+    --connection child2_3
+    DROP DATABASE IF EXISTS auto_test_remote3;
+  }
+  if ($USE_CHILD_GROUP3)
+  {
+    --connection child3_1
+    DROP DATABASE IF EXISTS auto_test_local;
+    --connection child3_2
+    DROP DATABASE IF EXISTS auto_test_local;
+    --connection child3_3
+    DROP DATABASE IF EXISTS auto_test_local;
+  }
+  --disable_query_log
+  --disable_result_log
+  --source ha_test_deinit.inc
+  --source test_deinit.inc
+  --enable_result_log
+  --enable_query_log
+  --enable_warnings
+  --skip $SKIP_REASON
+}
+
 --echo
 --echo test select 1
 --connection master_1

storage/spider/mysql-test/spider/handler/t/have_engine.inc

@@ -3,6 +3,5 @@ if (!`SELECT count(*) FROM information_schema.engines WHERE
       engine = '$TEST_ENGINE_TYPE'`)
 {
   SELECT engine, support FROM information_schema.engines;
-  --echo Need $TEST_ENGINE_TYPE engine
-  skip Need $TEST_ENGINE_TYPE engine;
+  --let $SKIP_REASON= "Need $TEST_ENGINE_TYPE engine"
 }

storage/spider/mysql-test/spider/handler/t/have_func.inc

 if (!`SELECT count(*) FROM mysql.func WHERE name = '$TEST_FUNC_NAME'`)
 {
   SELECT name FROM mysql.func;
-  --echo Need $TEST_FUNC_NAME function
-  skip Need $TEST_FUNC_NAME function;
+  --let $SKIP_REASON= "Need $TEST_FUNC_NAME function"
 }

storage/spider/mysql-test/spider/handler/t/spider_fixes.test

 # This test tests for Spider's bug fixes
+--let $SKIP_REASON=
 source include/have_log_bin.inc;
 --disable_warnings
 --disable_query_log
@@ -34,6 +35,34 @@ if ($USE_CHILD_GROUP2)
 }
 --enable_warnings
 
+if ($SKIP_REASON)
+{
+  --echo deinit
+  --disable_warnings
+  --connection master_1
+  DROP DATABASE IF EXISTS auto_test_local;
+  if ($USE_REPLICATION)
+  {
+    --connection slave1_1
+    DROP DATABASE IF EXISTS auto_test_local;
+  }
+  if ($USE_CHILD_GROUP2)
+  {
+    --connection child2_1
+    DROP DATABASE IF EXISTS auto_test_remote;
+    --connection child2_2
+    DROP DATABASE IF EXISTS auto_test_remote2;
+  }
+  --disable_query_log
+  --disable_result_log
+  --source slave_test_deinit.inc
+  --source test_deinit.inc
+  --enable_result_log
+  --enable_query_log
+  --enable_warnings
+  --skip $SKIP_REASON
+}
+
 --echo
 --echo test select 1
 --connection master_1

storage/spider/mysql-test/spider/handler/t/vp_fixes.test

 # This test tests for VP's bug fixes
+--let $SKIP_REASON=
 --disable_warnings
 --disable_query_log
 --disable_result_log
@@ -25,6 +26,28 @@ if ($USE_CHILD_GROUP2)
 }
 --enable_warnings
 
+if ($SKIP_REASON)
+{
+  --echo deinit
+  --disable_warnings
+  --connection master_1
+  DROP DATABASE IF EXISTS auto_test_local;
+  if ($USE_CHILD_GROUP2)
+  {
+    --connection child2_1
+    DROP DATABASE IF EXISTS auto_test_remote;
+    --connection child2_2
+    DROP DATABASE IF EXISTS auto_test_remote2;
+  }
+  --disable_query_log
+  --disable_result_log
+  --source test_deinit.inc
+  --enable_result_log
+  --enable_query_log
+  --enable_warnings
+  --skip $SKIP_REASON
+}
+
 --echo
 --echo test select 1
 --connection master_1

storage/spider/mysql-test/spider/include/deinit_engine.inc

 if ($INIT_TEST_ENGINE)
 {
-  if (`SELECT IF('$TEST_ENGINE_TYPE' = 'InnoDB', 1, 0)`)
-  {
-    --source ../include/deinit_innodb_plugin.inc
-    let $INIT_TEST_ENGINE=0;
-  }
-  if ($INIT_TEST_ENGINE)
-  {
-    --echo Unknown $TEST_ENGINE_TYPE engine for deinit
-    skip Unknown $TEST_ENGINE_TYPE engine for deinit;
-  }
+  --echo Deinit $TEST_ENGINE_TYPE engine
 }

storage/spider/mysql-test/spider/include/init_engine.inc

@@ -3,14 +3,8 @@ if (!`SELECT count(*) FROM information_schema.engines WHERE
       (support = 'YES' OR support = 'DEFAULT') AND
       engine = '$TEST_ENGINE_TYPE'`)
 {
-  if (`SELECT IF('$TEST_ENGINE_TYPE' = 'InnoDB', 1, 0)`)
+  if (!$SKIP_REASON)
   {
-    --source ../include/init_innodb_plugin.inc
-    let $INIT_TEST_ENGINE=1;
-  }
-  if (!$INIT_TEST_ENGINE)
-  {
-    --echo Unknown $TEST_ENGINE_TYPE engine for init
-    skip Unknown $TEST_ENGINE_TYPE engine for init;
+    --let $SKIP_REASON= "Need $TEST_ENGINE_TYPE engine"
   }
 }

storage/spider/mysql-test/spider/oracle/t/basic_sql.test

 # This test tests by executing basic SQL
+--let $SKIP_REASON=
 --disable_warnings
 --disable_query_log
 --disable_result_log
@@ -25,6 +26,28 @@ if ($USE_CHILD_GROUP2)
 }
 --enable_warnings
 
+if ($SKIP_REASON)
+{
+  --echo deinit
+  --disable_warnings
+  --connection master_1
+  DROP DATABASE IF EXISTS auto_test_local;
+  if ($USE_CHILD_GROUP2)
+  {
+    --connection child2_1
+    DROP DATABASE IF EXISTS auto_test_remote;
+    --connection child2_2
+    DROP DATABASE IF EXISTS auto_test_remote2;
+  }
+  --disable_query_log
+  --disable_result_log
+  --source test_deinit.inc
+  --enable_result_log
+  --enable_query_log
+  --enable_warnings
+  --skip $SKIP_REASON
+}
+
 --echo
 --echo test select 1
 --connection master_1

storage/spider/mysql-test/spider/oracle/t/direct_aggregate.test

+--let $SKIP_REASON=
 --disable_warnings
 --disable_query_log
 --disable_result_log
@@ -24,6 +25,28 @@ if ($USE_CHILD_GROUP2)
 }
 --enable_warnings
 
+if ($SKIP_REASON)
+{
+  --echo deinit
+  --disable_warnings
+  --connection master_1
+  DROP DATABASE IF EXISTS auto_test_local;
+  if ($USE_CHILD_GROUP2)
+  {
+    --connection child2_1
+    DROP DATABASE IF EXISTS auto_test_remote;
+    --connection child2_2
+    DROP DATABASE IF EXISTS auto_test_remote2;
+  }
+  --disable_query_log
+  --disable_result_log
+  --source test_deinit.inc
+  --enable_result_log
+  --enable_query_log
+  --enable_warnings
+  --skip $SKIP_REASON
+}
+
 --echo
 --echo test select 1
 --connection master_1

storage/spider/mysql-test/spider/oracle/t/direct_update.test

+--let $SKIP_REASON=
 --disable_warnings
 --disable_query_log
 --disable_result_log
@@ -24,6 +25,28 @@ if ($USE_CHILD_GROUP2)
 }
 --enable_warnings
 
+if ($SKIP_REASON)
+{
+  --echo deinit
+  --disable_warnings
+  --connection master_1
+  DROP DATABASE IF EXISTS auto_test_local;
+  if ($USE_CHILD_GROUP2)
+  {
+    --connection child2_1
+    DROP DATABASE IF EXISTS auto_test_remote;
+    --connection child2_2
+    DROP DATABASE IF EXISTS auto_test_remote2;
+  }
+  --disable_query_log
+  --disable_result_log
+  --source test_deinit.inc
+  --enable_result_log
+  --enable_query_log
+  --enable_warnings
+  --skip $SKIP_REASON
+}
+
 --echo
 --echo test select 1
 --connection master_1

storage/spider/mysql-test/spider/oracle/t/function.test

 # This test tests for using functions
+--let $SKIP_REASON=
 --disable_warnings
 --disable_query_log
 --disable_result_log
@@ -25,6 +26,28 @@ if ($USE_CHILD_GROUP2)
 }
 --enable_warnings
 
+if ($SKIP_REASON)
+{
+  --echo deinit
+  --disable_warnings
+  --connection master_1
+  DROP DATABASE IF EXISTS auto_test_local;
+  if ($USE_CHILD_GROUP2)
+  {
+    --connection child2_1
+    DROP DATABASE IF EXISTS auto_test_remote;
+    --connection child2_2
+    DROP DATABASE IF EXISTS auto_test_remote2;
+  }
+  --disable_query_log
+  --disable_result_log
+  --source test_deinit.inc
+  --enable_result_log
+  --enable_query_log
+  --enable_warnings
+  --skip $SKIP_REASON
+}
+
 --echo
 --echo test select 1
 --connection master_1

storage/spider/mysql-test/spider/oracle/t/ha.test

 # This test tests for ha features
+--let $SKIP_REASON=
 if ($USE_HA_TEST)
 {
 --disable_warnings
@@ -47,6 +48,40 @@ if ($USE_CHILD_GROUP3)
 }
 --enable_warnings
 
+if ($SKIP_REASON)
+{
+  --echo deinit
+  --disable_warnings
+  --connection master_1
+  DROP DATABASE IF EXISTS auto_test_local;
+  if ($USE_CHILD_GROUP2)
+  {
+    --connection child2_1
+    DROP DATABASE IF EXISTS auto_test_remote;
+    --connection child2_2
+    DROP DATABASE IF EXISTS auto_test_remote2;
+    --connection child2_3
+    DROP DATABASE IF EXISTS auto_test_remote3;
+  }
+  if ($USE_CHILD_GROUP3)
+  {
+    --connection child3_1
+    DROP DATABASE IF EXISTS auto_test_local;
+    --connection child3_2
+    DROP DATABASE IF EXISTS auto_test_local;
+    --connection child3_3
+    DROP DATABASE IF EXISTS auto_test_local;
+  }
+  --disable_query_log
+  --disable_result_log
+  --source ha_test_deinit.inc
+  --source test_deinit.inc
+  --enable_result_log
+  --enable_query_log
+  --enable_warnings
+  --skip $SKIP_REASON
+}
+
 --echo
 --echo test select 1
 --connection master_1

storage/spider/mysql-test/spider/oracle/t/have_engine.inc

@@ -3,6 +3,5 @@ if (!`SELECT count(*) FROM information_schema.engines WHERE
       engine = '$TEST_ENGINE_TYPE'`)
 {
   SELECT engine, support FROM information_schema.engines;
-  --echo Need $TEST_ENGINE_TYPE engine
-  skip Need $TEST_ENGINE_TYPE engine;
+  --let $SKIP_REASON= "Need $TEST_ENGINE_TYPE engine"
 }

storage/spider/mysql-test/spider/oracle/t/have_func.inc

 if (!`SELECT count(*) FROM mysql.func WHERE name = '$TEST_FUNC_NAME'`)
 {
   SELECT name FROM mysql.func;
-  --echo Need $TEST_FUNC_NAME function
-  skip Need $TEST_FUNC_NAME function;
+  --let $SKIP_REASON= "Need $TEST_FUNC_NAME function"
 }

storage/spider/mysql-test/spider/oracle/t/spider_fixes.test

 # This test tests for Spider's bug fixes
+--let $SKIP_REASON=
 source include/have_log_bin.inc;
 --disable_warnings
 --disable_query_log
@@ -34,6 +35,34 @@ if ($USE_CHILD_GROUP2)
 }
 --enable_warnings
 
+if ($SKIP_REASON)
+{
+  --echo deinit
+  --disable_warnings
+  --connection master_1
+  DROP DATABASE IF EXISTS auto_test_local;
+  if ($USE_REPLICATION)
+  {
+    --connection slave1_1
+    DROP DATABASE IF EXISTS auto_test_local;
+  }
+  if ($USE_CHILD_GROUP2)
+  {
+    --connection child2_1
+    DROP DATABASE IF EXISTS auto_test_remote;
+    --connection child2_2
+    DROP DATABASE IF EXISTS auto_test_remote2;
+  }
+  --disable_query_log
+  --disable_result_log
+  --source slave_test_deinit.inc
+  --source test_deinit.inc
+  --enable_result_log
+  --enable_query_log
+  --enable_warnings
+  --skip $SKIP_REASON
+}
+
 --echo
 --echo test select 1
 --connection master_1

storage/spider/mysql-test/spider/oracle/t/vp_fixes.test

 # This test tests for VP's bug fixes
+--let $SKIP_REASON=
 --disable_warnings
 --disable_query_log
 --disable_result_log
@@ -25,6 +26,28 @@ if ($USE_CHILD_GROUP2)
 }
 --enable_warnings
 
+if ($SKIP_REASON)
+{
+  --echo deinit
+  --disable_warnings
+  --connection master_1
+  DROP DATABASE IF EXISTS auto_test_local;
+  if ($USE_CHILD_GROUP2)
+  {
+    --connection child2_1
+    DROP DATABASE IF EXISTS auto_test_remote;
+    --connection child2_2
+    DROP DATABASE IF EXISTS auto_test_remote2;
+  }
+  --disable_query_log
+  --disable_result_log
+  --source test_deinit.inc
+  --enable_result_log
+  --enable_query_log
+  --enable_warnings
+  --skip $SKIP_REASON
+}
+
 --echo
 --echo test select 1
 --connection master_1

storage/spider/mysql-test/spider/oracle2/t/basic_sql.test

 # This test tests by executing basic SQL
+--let $SKIP_REASON=
 --disable_warnings
 --disable_query_log
 --disable_result_log
@@ -25,6 +26,28 @@ if ($USE_CHILD_GROUP2)
 }
 --enable_warnings
 
+if ($SKIP_REASON)
+{
+  --echo deinit
+  --disable_warnings
+  --connection master_1
+  DROP DATABASE IF EXISTS auto_test_local;
+  if ($USE_CHILD_GROUP2)
+  {
+    --connection child2_1
+    DROP DATABASE IF EXISTS auto_test_remote;
+    --connection child2_2
+    DROP DATABASE IF EXISTS auto_test_remote2;
+  }
+  --disable_query_log
+  --disable_result_log
+  --source test_deinit.inc
+  --enable_result_log
+  --enable_query_log
+  --enable_warnings
+  --skip $SKIP_REASON
+}
+
 --echo
 --echo test select 1
 --connection master_1

storage/spider/mysql-test/spider/oracle2/t/direct_aggregate.test

+--let $SKIP_REASON=
 --disable_warnings
 --disable_query_log
 --disable_result_log
@@ -24,6 +25,28 @@ if ($USE_CHILD_GROUP2)
 }
 --enable_warnings
 
+if ($SKIP_REASON)
+{
+  --echo deinit
+  --disable_warnings
+  --connection master_1
+  DROP DATABASE IF EXISTS auto_test_local;
+  if ($USE_CHILD_GROUP2)
+  {
+    --connection child2_1
+    DROP DATABASE IF EXISTS auto_test_remote;
+    --connection child2_2
+    DROP DATABASE IF EXISTS auto_test_remote2;
+  }
+  --disable_query_log
+  --disable_result_log
+  --source test_deinit.inc
+  --enable_result_log
+  --enable_query_log
+  --enable_warnings
+  --skip $SKIP_REASON
+}
+
 --echo
 --echo test select 1
 --connection master_1

storage/spider/mysql-test/spider/oracle2/t/direct_update.test

+--let $SKIP_REASON=
 --disable_warnings
 --disable_query_log
 --disable_result_log
@@ -24,6 +25,28 @@ if ($USE_CHILD_GROUP2)
 }
 --enable_warnings
 
+if ($SKIP_REASON)
+{
+  --echo deinit
+  --disable_warnings
+  --connection master_1
+  DROP DATABASE IF EXISTS auto_test_local;
+  if ($USE_CHILD_GROUP2)
+  {
+    --connection child2_1
+    DROP DATABASE IF EXISTS auto_test_remote;
+    --connection child2_2
+    DROP DATABASE IF EXISTS auto_test_remote2;
+  }
+  --disable_query_log
+  --disable_result_log
+  --source test_deinit.inc
+  --enable_result_log
+  --enable_query_log
+  --enable_warnings
+  --skip $SKIP_REASON
+}
+
 --echo
 --echo test select 1
 --connection master_1

storage/spider/mysql-test/spider/oracle2/t/function.test

 # This test tests for using functions
+--let $SKIP_REASON=
 --disable_warnings
 --disable_query_log
 --disable_result_log
@@ -25,6 +26,28 @@ if ($USE_CHILD_GROUP2)
 }
 --enable_warnings
 
+if ($SKIP_REASON)
+{
+  --echo deinit
+  --disable_warnings
+  --connection master_1
+  DROP DATABASE IF EXISTS auto_test_local;
+  if ($USE_CHILD_GROUP2)
+  {
+    --connection child2_1
+    DROP DATABASE IF EXISTS auto_test_remote;
+    --connection child2_2
+    DROP DATABASE IF EXISTS auto_test_remote2;
+  }
+  --disable_query_log
+  --disable_result_log
+  --source test_deinit.inc
+  --enable_result_log
+  --enable_query_log
+  --enable_warnings
+  --skip $SKIP_REASON
+}
+
 --echo
 --echo test select 1
 --connection master_1

storage/spider/mysql-test/spider/oracle2/t/ha.test

 # This test tests for ha features
+--let $SKIP_REASON=
 if ($USE_HA_TEST)
 {
 --disable_warnings
@@ -47,6 +48,40 @@ if ($USE_CHILD_GROUP3)
 }
 --enable_warnings
 
+if ($SKIP_REASON)
+{
+  --echo deinit
+  --disable_warnings
+  --connection master_1
+  DROP DATABASE IF EXISTS auto_test_local;
+  if ($USE_CHILD_GROUP2)
+  {
+    --connection child2_1
+    DROP DATABASE IF EXISTS auto_test_remote;
+    --connection child2_2
+    DROP DATABASE IF EXISTS auto_test_remote2;
+    --connection child2_3
+    DROP DATABASE IF EXISTS auto_test_remote3;
+  }
+  if ($USE_CHILD_GROUP3)
+  {
+    --connection child3_1
+    DROP DATABASE IF EXISTS auto_test_local;
+    --connection child3_2
+    DROP DATABASE IF EXISTS auto_test_local;
+    --connection child3_3
+    DROP DATABASE IF EXISTS auto_test_local;
+  }
+  --disable_query_log
+  --disable_result_log
+  --source ha_test_deinit.inc
+  --source test_deinit.inc
+  --enable_result_log
+  --enable_query_log
+  --enable_warnings
+  --skip $SKIP_REASON
+}
+
 --echo
 --echo test select 1
 --connection master_1

storage/spider/mysql-test/spider/oracle2/t/have_engine.inc

@@ -3,6 +3,5 @@ if (!`SELECT count(*) FROM information_schema.engines WHERE
       engine = '$TEST_ENGINE_TYPE'`)
 {
   SELECT engine, support FROM information_schema.engines;
-  --echo Need $TEST_ENGINE_TYPE engine
-  skip Need $TEST_ENGINE_TYPE engine;
+  --let $SKIP_REASON= "Need $TEST_ENGINE_TYPE engine"
 }

storage/spider/mysql-test/spider/oracle2/t/have_func.inc

 if (!`SELECT count(*) FROM mysql.func WHERE name = '$TEST_FUNC_NAME'`)
 {
   SELECT name FROM mysql.func;
-  --echo Need $TEST_FUNC_NAME function
-  skip Need $TEST_FUNC_NAME function;
+  --let $SKIP_REASON= "Need $TEST_FUNC_NAME function"
 }

storage/spider/mysql-test/spider/oracle2/t/spider_fixes.test

 # This test tests for Spider's bug fixes
+--let $SKIP_REASON=
 source include/have_log_bin.inc;
 --disable_warnings
 --disable_query_log
@@ -34,6 +35,34 @@ if ($USE_CHILD_GROUP2)
 }
 --enable_warnings
 
+if ($SKIP_REASON)
+{
+  --echo deinit
+  --disable_warnings
+  --connection master_1
+  DROP DATABASE IF EXISTS auto_test_local;
+  if ($USE_REPLICATION)
+  {
+    --connection slave1_1
+    DROP DATABASE IF EXISTS auto_test_local;
+  }
+  if ($USE_CHILD_GROUP2)
+  {
+    --connection child2_1
+    DROP DATABASE IF EXISTS auto_test_remote;
+    --connection child2_2
+    DROP DATABASE IF EXISTS auto_test_remote2;
+  }
+  --disable_query_log
+  --disable_result_log
+  --source slave_test_deinit.inc
+  --source test_deinit.inc
+  --enable_result_log
+  --enable_query_log
+  --enable_warnings
+  --skip $SKIP_REASON
+}
+
 --echo
 --echo test select 1
 --connection master_1

storage/spider/mysql-test/spider/oracle2/t/vp_fixes.test

 # This test tests for VP's bug fixes
+--let $SKIP_REASON=
 --disable_warnings
 --disable_query_log
 --disable_result_log
@@ -25,6 +26,28 @@ if ($USE_CHILD_GROUP2)
 }
 --enable_warnings
 
+if ($SKIP_REASON)
+{
+  --echo deinit
+  --disable_warnings
+  --connection master_1
+  DROP DATABASE IF EXISTS auto_test_local;
+  if ($USE_CHILD_GROUP2)
+  {
+    --connection child2_1
+    DROP DATABASE IF EXISTS auto_test_remote;
+    --connection child2_2
+    DROP DATABASE IF EXISTS auto_test_remote2;
+  }
+  --disable_query_log
+  --disable_result_log
+  --source test_deinit.inc
+  --enable_result_log
+  --enable_query_log
+  --enable_warnings
+  --skip $SKIP_REASON
+}
+
 --echo
 --echo test select 1
 --connection master_1

storage/spider/mysql-test/spider/t/basic_sql.test

 # This test tests by executing basic SQL
+--let $SKIP_REASON=
 --disable_warnings
 --disable_query_log
 --disable_result_log
@@ -25,6 +26,28 @@ if ($USE_CHILD_GROUP2)
 }
 --enable_warnings
 
+if ($SKIP_REASON)
+{
+  --echo deinit
+  --disable_warnings
+  --connection master_1
+  DROP DATABASE IF EXISTS auto_test_local;
+  if ($USE_CHILD_GROUP2)
+  {
+    --connection child2_1
+    DROP DATABASE IF EXISTS auto_test_remote;
+    --connection child2_2
+    DROP DATABASE IF EXISTS auto_test_remote2;
+  }
+  --disable_query_log
+  --disable_result_log
+  --source test_deinit.inc
+  --enable_result_log
+  --enable_query_log
+  --enable_warnings
+  --skip $SKIP_REASON
+}
+
 --echo
 --echo test select 1
 --connection master_1

storage/spider/mysql-test/spider/t/direct_aggregate.test

+--let $SKIP_REASON=
 --disable_warnings
 --disable_query_log
 --disable_result_log
@@ -24,6 +25,28 @@ if ($USE_CHILD_GROUP2)
 }
 --enable_warnings
 
+if ($SKIP_REASON)
+{
+  --echo deinit
+  --disable_warnings
+  --connection master_1
+  DROP DATABASE IF EXISTS auto_test_local;
+  if ($USE_CHILD_GROUP2)
+  {
+    --connection child2_1
+    DROP DATABASE IF EXISTS auto_test_remote;
+    --connection child2_2
+    DROP DATABASE IF EXISTS auto_test_remote2;
+  }
+  --disable_query_log
+  --disable_result_log
+  --source test_deinit.inc
+  --enable_result_log
+  --enable_query_log
+  --enable_warnings
+  --skip $SKIP_REASON
+}
+
 --echo
 --echo test select 1
 --connection master_1

storage/spider/mysql-test/spider/t/direct_update.test

+--let $SKIP_REASON=
 --disable_warnings
 --disable_query_log
 --disable_result_log
@@ -24,6 +25,28 @@ if ($USE_CHILD_GROUP2)
 }
 --enable_warnings
 
+if ($SKIP_REASON)
+{
+  --echo deinit
+  --disable_warnings
+  --connection master_1
+  DROP DATABASE IF EXISTS auto_test_local;
+  if ($USE_CHILD_GROUP2)
+  {
+    --connection child2_1
+    DROP DATABASE IF EXISTS auto_test_remote;
+    --connection child2_2
+    DROP DATABASE IF EXISTS auto_test_remote2;
+  }
+  --disable_query_log
+  --disable_result_log
+  --source test_deinit.inc
+  --enable_result_log
+  --enable_query_log
+  --enable_warnings
+  --skip $SKIP_REASON
+}
+
 --echo
 --echo test select 1
 --connection master_1

storage/spider/mysql-test/spider/t/function.test

 # This test tests for using functions
+--let $SKIP_REASON=
 --disable_warnings
 --disable_query_log
 --disable_result_log
@@ -25,6 +26,28 @@ if ($USE_CHILD_GROUP2)
 }
 --enable_warnings
 
+if ($SKIP_REASON)
+{
+  --echo deinit
+  --disable_warnings
+  --connection master_1
+  DROP DATABASE IF EXISTS auto_test_local;
+  if ($USE_CHILD_GROUP2)
+  {
+    --connection child2_1
+    DROP DATABASE IF EXISTS auto_test_remote;
+    --connection child2_2
+    DROP DATABASE IF EXISTS auto_test_remote2;
+  }
+  --disable_query_log
+  --disable_result_log
+  --source test_deinit.inc
+  --enable_result_log
+  --enable_query_log
+  --enable_warnings
+  --skip $SKIP_REASON
+}
+
 --echo
 --echo test select 1
 --connection master_1

storage/spider/mysql-test/spider/t/ha.test

 # This test tests for ha features
+--let $SKIP_REASON=
 if ($USE_HA_TEST)
 {
 --disable_warnings
@@ -47,6 +48,40 @@ if ($USE_CHILD_GROUP3)
 }
 --enable_warnings
 
+if ($SKIP_REASON)
+{
+  --echo deinit
+  --disable_warnings
+  --connection master_1
+  DROP DATABASE IF EXISTS auto_test_local;
+  if ($USE_CHILD_GROUP2)
+  {
+    --connection child2_1
+    DROP DATABASE IF EXISTS auto_test_remote;
+    --connection child2_2
+    DROP DATABASE IF EXISTS auto_test_remote2;
+    --connection child2_3
+    DROP DATABASE IF EXISTS auto_test_remote3;
+  }
+  if ($USE_CHILD_GROUP3)
+  {
+    --connection child3_1
+    DROP DATABASE IF EXISTS auto_test_local;
+    --connection child3_2
+    DROP DATABASE IF EXISTS auto_test_local;
+    --connection child3_3
+    DROP DATABASE IF EXISTS auto_test_local;
+  }
+  --disable_query_log
+  --disable_result_log
+  --source ha_test_deinit.inc
+  --source test_deinit.inc
+  --enable_result_log
+  --enable_query_log
+  --enable_warnings
+  --skip $SKIP_REASON
+}
+
 --echo
 --echo test select 1
 --connection master_1

storage/spider/mysql-test/spider/t/have_engine.inc

@@ -3,6 +3,5 @@ if (!`SELECT count(*) FROM information_schema.engines WHERE
       engine = '$TEST_ENGINE_TYPE'`)
 {
   SELECT engine, support FROM information_schema.engines;
-  --echo Need $TEST_ENGINE_TYPE engine
-  skip Need $TEST_ENGINE_TYPE engine;
+  --let $SKIP_REASON= "Need $TEST_ENGINE_TYPE engine"
 }

storage/spider/mysql-test/spider/t/have_func.inc

 if (!`SELECT count(*) FROM mysql.func WHERE name = '$TEST_FUNC_NAME'`)
 {
   SELECT name FROM mysql.func;
-  --echo Need $TEST_FUNC_NAME function
-  skip Need $TEST_FUNC_NAME function;
+  --let $SKIP_REASON= "Need $TEST_FUNC_NAME function"
 }

storage/spider/mysql-test/spider/t/spider_fixes.test

 # This test tests for Spider's bug fixes
+--let $SKIP_REASON=
 source include/have_log_bin.inc;
 --disable_warnings
 --disable_query_log
@@ -34,6 +35,34 @@ if ($USE_CHILD_GROUP2)
 }
 --enable_warnings
 
+if ($SKIP_REASON)
+{
+  --echo deinit
+  --disable_warnings
+  --connection master_1
+  DROP DATABASE IF EXISTS auto_test_local;
+  if ($USE_REPLICATION)
+  {
+    --connection slave1_1
+    DROP DATABASE IF EXISTS auto_test_local;
+  }
+  if ($USE_CHILD_GROUP2)
+  {
+    --connection child2_1
+    DROP DATABASE IF EXISTS auto_test_remote;
+    --connection child2_2
+    DROP DATABASE IF EXISTS auto_test_remote2;
+  }
+  --disable_query_log
+  --disable_result_log
+  --source slave_test_deinit.inc
+  --source test_deinit.inc
+  --enable_result_log
+  --enable_query_log
+  --enable_warnings
+  --skip $SKIP_REASON
+}
+
 --echo
 --echo test select 1
 --connection master_1

storage/spider/mysql-test/spider/t/vp_fixes.test

 # This test tests for VP's bug fixes
+--let $SKIP_REASON=
 --disable_warnings
 --disable_query_log
 --disable_result_log
@@ -25,6 +26,28 @@ if ($USE_CHILD_GROUP2)
 }
 --enable_warnings
 
+if ($SKIP_REASON)
+{
+  --echo deinit
+  --disable_warnings
+  --connection master_1
+  DROP DATABASE IF EXISTS auto_test_local;
+  if ($USE_CHILD_GROUP2)
+  {
+    --connection child2_1
+    DROP DATABASE IF EXISTS auto_test_remote;
+    --connection child2_2
+    DROP DATABASE IF EXISTS auto_test_remote2;
+  }
+  --disable_query_log
+  --disable_result_log
+  --source test_deinit.inc
+  --enable_result_log
+  --enable_query_log
+  --enable_warnings
+  --skip $SKIP_REASON
+}
+
 --echo
 --echo test select 1
 --connection master_1