From 7657ee10f8be9ed041e3e215b4e2e8cb933abe60 Mon Sep 17 00:00:00 2001 From: Magne Mahre <magne.mahre@sun.com> Date: Tue, 22 Jun 2010 12:13:47 +0200 Subject: [PATCH] Post-push fixups for WL#5349 mysql-test/suite/perfschema/t/no_threads-master.opt: Innodb will start multiple threads, which is not compatible with --one-thread. Disable innodb to be able to run the test case. --- cmake/create_initial_db.cmake.in | 3 ++- mysql-test/suite/perfschema/t/no_threads-master.opt | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/cmake/create_initial_db.cmake.in b/cmake/create_initial_db.cmake.in index 01b2da665a6..881afe265ef 100644 --- a/cmake/create_initial_db.cmake.in +++ b/cmake/create_initial_db.cmake.in @@ -57,6 +57,7 @@ SET(BOOTSTRAP_COMMAND --lc-messages-dir=${CMAKE_CURRENT_BINARY_DIR}/share --basedir=. --datadir=. + --default-storage-engine=MyISAM --loose-skip-innodb --loose-skip-ndbcluster --max_allowed_packet=8M @@ -79,4 +80,4 @@ EXECUTE_PROCESS ( IF(NOT RESULT EQUAL 0) MESSAGE(FATAL_ERROR "Could not create initial database \n ${OUT} \n ${ERR}") ENDIF() - \ No newline at end of file + diff --git a/mysql-test/suite/perfschema/t/no_threads-master.opt b/mysql-test/suite/perfschema/t/no_threads-master.opt index b15ab02821d..0dfb498094a 100644 --- a/mysql-test/suite/perfschema/t/no_threads-master.opt +++ b/mysql-test/suite/perfschema/t/no_threads-master.opt @@ -1 +1 @@ ---one-thread --thread-handling=no-threads --loose-performance-schema-max-thread_instances=10 +--one-thread --thread-handling=no-threads --loose-performance-schema-max-thread_instances=10 --default-storage-engine=MyISAM --skip-innodb