Shift skipping of some tests with embedded server from within

mysql-test-run to the tests themselves.


mysql-test/t/bdb-deadlock.test:
  Don't run this test with embedded server
mysql-test/mysql-test-run.sh:
  Remove tests from being skipped with embedded server
mysql-test/t/connect.test:
  Skip test under embedded server
mysql-test/t/flush_block_commit.test:
  Skip test under embedded server
mysql-test/t/grant.test:
  Skip test under embedded server
mysql-test/t/grant2.test:
  Skip test under embedded server
mysql-test/t/grant_cache.test:
  Skip test under embedded server

7 files changed, 16 insertions, 7 deletions

diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh
index f31d1af48aa..1d670fd1a16 100644
--- a/mysql-test/mysql-test-run.sh
+++ b/mysql-test/mysql-test-run.sh
@@ -1506,12 +1506,6 @@ run_testcase ()
  # script soon anyway so it is not worth it spending the time
  if [ "x$USE_EMBEDDED_SERVER" = "x1" -a -z "$DO_TEST" ] ; then
    for t in \
-	"bdb-deadlock" \
-	"connect" \
-	"flush_block_commit" \
-	"grant2" \
-	"grant_cache" \
-	"grant" \
 	"init_connect" \
 	"init_file" \
         "innodb" \
diff --git a/mysql-test/t/bdb-deadlock.test b/mysql-test/t/bdb-deadlock.test
index d86403fcffc..5e6ca666cc2 100644
--- a/mysql-test/t/bdb-deadlock.test
+++ b/mysql-test/t/bdb-deadlock.test
@@ -5,7 +5,7 @@
 # connection in a separate thread.
 #
 
-#-- source include/not_embedded.inc
+-- source include/not_embedded.inc
 -- source include/have_bdb.inc
 
 connect (con1,localhost,root,,);
diff --git a/mysql-test/t/connect.test b/mysql-test/t/connect.test
index 4598ca5ea15..034cd11d0c1 100644
--- a/mysql-test/t/connect.test
+++ b/mysql-test/t/connect.test
@@ -3,6 +3,9 @@
 # Unfortunately the check is incomplete as we can't handle errors on connect
 # Also we can't connect without database
 
+# This test makes no sense with the embedded server
+--source include/not_embedded.inc
+
 #connect (con1,localhost,root,,"");
 #show tables;
 connect (con1,localhost,root,,mysql);
diff --git a/mysql-test/t/flush_block_commit.test b/mysql-test/t/flush_block_commit.test
index 87715452089..49d68d05fb6 100644
--- a/mysql-test/t/flush_block_commit.test
+++ b/mysql-test/t/flush_block_commit.test
@@ -3,6 +3,10 @@
 # We verify that we did not introduce a deadlock.
 # This is intended to mimick how mysqldump and innobackup work.
 
+# This test doesn't work with the embedded server
+-- source include/not_embedded.inc
+
+# And it requires InnoDB
 -- source include/have_innodb.inc
 
 connect (con1,localhost,root,,);
diff --git a/mysql-test/t/grant.test b/mysql-test/t/grant.test
index 2ca930d4fd2..1c8fbe0ff0d 100644
--- a/mysql-test/t/grant.test
+++ b/mysql-test/t/grant.test
@@ -1,5 +1,8 @@
 # Test of GRANT commands
 
+# Grant tests not performed with embedded server
+-- source include/not_embedded.inc
+
 # Cleanup
 --disable_warnings
 drop table if exists t1;
diff --git a/mysql-test/t/grant2.test b/mysql-test/t/grant2.test
index 7060d35e9a4..0918e618197 100644
--- a/mysql-test/t/grant2.test
+++ b/mysql-test/t/grant2.test
@@ -1,3 +1,6 @@
+# Grant tests not performed with embedded server
+-- source include/not_embedded.inc
+
 SET NAMES binary;
 
 #
diff --git a/mysql-test/t/grant_cache.test b/mysql-test/t/grant_cache.test
index e5bde977bb7..7d6f7262f0a 100644
--- a/mysql-test/t/grant_cache.test
+++ b/mysql-test/t/grant_cache.test
@@ -1,3 +1,5 @@
+# Grant tests not performed with embedded server
+-- source include/not_embedded.inc
 -- source include/have_query_cache.inc
 
 #