Commit ff9a1bd2 authored by unknown's avatar unknown
Browse files

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
parent 20586596

mysql-test/mysql-test-run.sh

+0 −6
Original line number Diff line number Diff line
@@ -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" \

mysql-test/t/bdb-deadlock.test

+1 −1
Original line number Diff line number Diff line
@@ -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,,);

mysql-test/t/connect.test

+3 −0
Original line number Diff line number Diff line
@@ -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);

mysql-test/t/flush_block_commit.test

+4 −0
Original line number Diff line number Diff line
@@ -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,,);

mysql-test/t/grant.test

+3 −0
Original line number Diff line number Diff line 
# Test of GRANT commands



# Grant tests not performed with embedded server

-- source include/not_embedded.inc



# Cleanup

--disable_warnings

drop table if exists t1;