diff options
author | Mikael Ronstrom <mikael@dator8> | 2010-11-19 14:43:13 +0100 |
---|---|---|
committer | Mikael Ronstrom <mikael@dator8> | 2010-11-19 14:43:13 +0100 |
commit | d0182e61a189fada37c19281c69fd4824e6092a8 (patch) | |
tree | d1fd8627549b4ec0c0804055e2bd0e15187112b3 | |
parent | 6a7151903f2338bb2f89fdc48f2ff21e085f4bae (diff) | |
download | mariadb-git-d0182e61a189fada37c19281c69fd4824e6092a8.tar.gz |
Disabled a number of tests when using thread pool
-rw-r--r-- | mysql-test/suite/perfschema/t/no_threads.test | 1 | ||||
-rw-r--r-- | mysql-test/suite/perfschema/t/one_thread_per_con.test | 1 | ||||
-rw-r--r-- | mysql-test/suite/sys_vars/t/all_vars.test | 1 | ||||
-rw-r--r-- | mysql-test/t/information_schema.test | 3 | ||||
-rw-r--r-- | mysql-test/t/information_schema_db.test | 3 | ||||
-rw-r--r-- | mysql-test/t/mysqlshow.test | 2 | ||||
-rw-r--r-- | mysql-test/t/no-threads.test | 1 |
7 files changed, 12 insertions, 0 deletions
diff --git a/mysql-test/suite/perfschema/t/no_threads.test b/mysql-test/suite/perfschema/t/no_threads.test index 9254535bf1f..2f4f4476362 100644 --- a/mysql-test/suite/perfschema/t/no_threads.test +++ b/mysql-test/suite/perfschema/t/no_threads.test @@ -17,6 +17,7 @@ --source include/not_embedded.inc --source include/have_perfschema.inc +--source include/not_threadpool.inc # Setup : in this main thread diff --git a/mysql-test/suite/perfschema/t/one_thread_per_con.test b/mysql-test/suite/perfschema/t/one_thread_per_con.test index 7d0daffe228..eaca92875dd 100644 --- a/mysql-test/suite/perfschema/t/one_thread_per_con.test +++ b/mysql-test/suite/perfschema/t/one_thread_per_con.test @@ -17,6 +17,7 @@ --source include/not_embedded.inc --source include/have_perfschema.inc +--source include/not_threadpool.inc # Setup diff --git a/mysql-test/suite/sys_vars/t/all_vars.test b/mysql-test/suite/sys_vars/t/all_vars.test index e9e7e16687a..d8a57b22fe3 100644 --- a/mysql-test/suite/sys_vars/t/all_vars.test +++ b/mysql-test/suite/sys_vars/t/all_vars.test @@ -14,6 +14,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA --source include/not_embedded.inc +--source include/not_threadpool.inc # 2010-01-28 OBN Added support to load 'innodb' and 'semisync' if possible. # As we need to have there variables loaded if the components exist but do diff --git a/mysql-test/t/information_schema.test b/mysql-test/t/information_schema.test index f5fab966bdd..e9b569cd440 100644 --- a/mysql-test/t/information_schema.test +++ b/mysql-test/t/information_schema.test @@ -1,6 +1,9 @@ # This test uses grants, which can't get tested for embedded server -- source include/not_embedded.inc +#Don't run this test when thread_pool active +--source include/not_threadpool.inc + # check that CSV engine was compiled in, as the result of the test depends # on the presence of the log tables (which are CSV-based). --source include/have_csv.inc diff --git a/mysql-test/t/information_schema_db.test b/mysql-test/t/information_schema_db.test index 7326f33b113..f1aebfa4bed 100644 --- a/mysql-test/t/information_schema_db.test +++ b/mysql-test/t/information_schema_db.test @@ -2,6 +2,9 @@ # in the embedded server by default). So skip the test in embedded-server mode. -- source include/not_embedded.inc +#Don't run this test when thread_pool active +--source include/not_threadpool.inc + -- source include/testdb_only.inc --disable_warnings diff --git a/mysql-test/t/mysqlshow.test b/mysql-test/t/mysqlshow.test index 66ec8e22ab1..515e2bcf325 100644 --- a/mysql-test/t/mysqlshow.test +++ b/mysql-test/t/mysqlshow.test @@ -2,6 +2,8 @@ -- source include/not_embedded.inc # Test lists tables in Information_schema, and InnoDB adds some -- source include/have_innodb.inc +# Don't test when thread_pool active +--source include/not_threadpool.inc --disable_warnings DROP TABLE IF EXISTS t1,t2,test1,test2; diff --git a/mysql-test/t/no-threads.test b/mysql-test/t/no-threads.test index fd8365e5678..c2b326897f8 100644 --- a/mysql-test/t/no-threads.test +++ b/mysql-test/t/no-threads.test @@ -1,3 +1,4 @@ +--source include/not_threadpool.inc # # Test the --thread-handler=no-threads option # |