bzr push into mysql-trunk branch (Georgi.Kodinov:3295 to 3296) Bug#12767683

[Georgi Kodinov]

 3296 Georgi Kodinov	2011-07-25
      Bug #12767683 : SERVER START FAILS IN THE PKGVER TEST ON WINDOWS
      
      Added an --default-temp-storage-engine=mysiam to complement the
      --default-storage-engine option already present.
      Removed a duplicate --default-storage-engine.

    modified:
      cmake/create_initial_db.cmake.in
 3295 Anitha Gopi	2011-07-25
      Fixed syntax

    modified:
      mysql-test/collections/default.weekly
=== modified file 'cmake/create_initial_db.cmake.in'
--- a/cmake/create_initial_db.cmake.in	2011-06-30 15:50:45 +0000
+++ b/cmake/create_initial_db.cmake.in	2011-07-25 09:26:08 +0000
@@ -54,11 +54,11 @@ SET(BOOTSTRAP_COMMAND 
   --no-defaults 
   ${CONSOLE}
   --bootstrap
-  --default-storage-engine=myisam
   --lc-messages-dir=${CMAKE_CURRENT_BINARY_DIR}/share
   --basedir=.
   --datadir=.
   --default-storage-engine=MyISAM
+  --default-temp-storage-engine=MyISAM
   --loose-skip-innodb
   --loose-skip-ndbcluster
   --max_allowed_packet=8M

No bundle (reason: useless for push emails).