bk commit into 4.1 tree (monty:1.2192)

[monty]

Below is the list of changes that have just been committed into a local
4.1 repository of monty. When monty 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
  1.2192 05/04/16 04:12:30 monty@stripped +2 -0
  Ensure that all privilege tables are created in MyISAM

  scripts/mysql_fix_privilege_tables.sql
    1.12 05/04/16 04:12:22 monty@stripped +2 -0
    Ensure that all privilege tables are created in MyISAM

  scripts/mysql_create_system_tables.sh
    1.21 05/04/16 04:12:22 monty@stripped +1 -0
    Ensure that all privilege tables are created in MyISAM

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	monty
# Host:	mishka.local
# Root:	/home/my/mysql-4.1

--- 1.11/scripts/mysql_fix_privilege_tables.sql	Fri Feb 11 06:23:36 2005
+++ 1.12/scripts/mysql_fix_privilege_tables.sql	Sat Apr 16 04:12:22 2005
@@ -9,6 +9,8 @@
 -- this sql script.
 -- On windows you should do 'mysql --force mysql < mysql_fix_privilege_tables.sql'
 
+set table_type=MyISAM;
+
 CREATE TABLE IF NOT EXISTS func (
   name char(64) binary DEFAULT '' NOT NULL,
   ret tinyint(1) DEFAULT '0' NOT NULL,

--- 1.20/scripts/mysql_create_system_tables.sh	Fri Apr  1 19:56:42 2005
+++ 1.21/scripts/mysql_create_system_tables.sh	Sat Apr 16 04:12:22 2005
@@ -629,6 +629,7 @@
 
 cat << END_OF_DATA
 use mysql;
+set table_type=myisam;
 $c_d
 $i_d