bk commit into 5.1 tree (msvensson:1.2615)

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-11-26 18:46:05+01:00, msvensson@stripped +1 -0
  Use myisam as default storage engine when running mysqld in --bootstrap
  mode

  scripts/mysql_install_db.sh@stripped, 2007-11-26 18:46:02+01:00, msvensson@stripped +1 -0
    Bug#31315 mysql_install_db fails if a default table type of NDB is set in my.cnf
     - Use myisam as default storage engine when running mysqld in --bootstrap
     mode

diff -Nrup a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh
--- a/scripts/mysql_install_db.sh	2007-11-08 13:42:01 +01:00
+++ b/scripts/mysql_install_db.sh	2007-11-26 18:46:02 +01:00
@@ -314,6 +314,7 @@ mysqld_bootstrap="${MYSQLD_BOOTSTRAP-$my
 mysqld_install_cmd_line="$mysqld_bootstrap $defaults $mysqld_opt --bootstrap \
   --basedir=$basedir --datadir=$ldata --log-warnings=0 --loose-skip-innodb \
   --loose-skip-ndbcluster $args --max_allowed_packet=8M \
+  --default-storage-engine=myisam \
   --net_buffer_length=16K"
 
 # Create the system and help tables by passing them to "mysqld --bootstrap"