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

[Magne Mahre]

 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
 3064 Alexander Nozdrin	2010-06-21 [merge]
      Auto-merge from mysql-trunk-stage.

    added:
      packaging/
      packaging/WiX/
      packaging/WiX/AdminBackground.jpg
      packaging/WiX/AdminHeader.jpg
      packaging/WiX/CMakeLists.txt
      packaging/WiX/CPackWixConfig.cmake
      packaging/WiX/MySQLServer.ico
      packaging/WiX/ca/
      packaging/WiX/ca/CMakeLists.txt
      packaging/WiX/ca/CustomAction.cpp
      packaging/WiX/ca/CustomAction.def
      packaging/WiX/ca/CustomAction.rc
      packaging/WiX/create_msi.cmake.in
      packaging/WiX/extra.wxs.in
      packaging/WiX/mysql_server.wxs.in
    modified:
      CMakeLists.txt
      client/CMakeLists.txt
      cmake/create_initial_db.cmake.in
      cmake/install_macros.cmake
      cmake/libutils.cmake
      cmake/mysql_add_executable.cmake
      cmake/package_name.cmake
      cmake/plugin.cmake
      config.h.cmake
      configure.cmake
      extra/CMakeLists.txt
      include/CMakeLists.txt
      libmysql/CMakeLists.txt
      libmysqld/CMakeLists.txt
      mysql-test/CMakeLists.txt
      mysql-test/lib/My/SafeProcess/CMakeLists.txt
      mysys/my_init.c
      plugin/audit_null/CMakeLists.txt
      plugin/daemon_example/CMakeLists.txt
      scripts/CMakeLists.txt
      scripts/mysqld_safe.sh
      sql/CMakeLists.txt
      sql/share/CMakeLists.txt
      support-files/CMakeLists.txt
      support-files/mysql.spec.sh
      tests/CMakeLists.txt
=== 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]