bzr commit into mysql-trunk-bugfixing branch (magne.mahre:3065) WL#5349

[Magne Mahre]

#At file:///export/home/tmp/x/mysql-trunk-bugfixing/ based on revid:alik@ibmvm-20100621130816-7wli5qo66zhcph7t

 3065 Magne Mahre	2010-06-22
      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.

    modified:
      cmake/create_initial_db.cmake.in
      mysql-test/suite/perfschema/t/no_threads-master.opt
=== modified file 'cmake/create_initial_db.cmake.in'
--- a/cmake/create_initial_db.cmake.in	2010-04-30 13:28:08 +0000
+++ b/cmake/create_initial_db.cmake.in	2010-06-22 10:13:47 +0000
@@ -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
+ 

=== modified file 'mysql-test/suite/perfschema/t/no_threads-master.opt'
--- a/mysql-test/suite/perfschema/t/no_threads-master.opt	2010-01-12 01:47:27 +0000
+++ b/mysql-test/suite/perfschema/t/no_threads-master.opt	2010-06-22 10:13:47 +0000
@@ -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


Attachment: [text/bzr-bundle] bzr/[e-mail]