bk commit into 5.0 tree (serg:1.1995)

[Sergei Golubchik]

Below is the list of changes that have just been committed into a local
5.0 repository of serg. When serg 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.1995 05/09/27 12:10:22 serg@stripped +2 -0
  mysql.user.password doesn't need utf8

  scripts/mysql_fix_privilege_tables.sql
    1.31 05/09/27 12:10:10 serg@stripped +1 -1
    mysql.user.password doesn't need utf8

  scripts/mysql_create_system_tables.sh
    1.27 05/09/27 12:10:10 serg@stripped +1 -1
    mysql.user.password doesn't need utf8

# 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:	serg
# Host:	serg.mylan
# Root:	/usr/home/serg/Abk/mysql-5.0

--- 1.30/scripts/mysql_fix_privilege_tables.sql	Wed Aug 24 01:37:17 2005
+++ 1.31/scripts/mysql_fix_privilege_tables.sql	Tue Sep 27 12:10:10 2005
@@ -156,9 +156,9 @@ alter table columns_priv comment='Column
 ALTER TABLE user
   MODIFY Host char(60) NOT NULL default '',
   MODIFY User char(16) NOT NULL default '',
-  MODIFY Password char(41) NOT NULL default '',
   ENGINE=MyISAM, CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin;
 ALTER TABLE user
+  MODIFY Password binary(41) NOT NULL default '',
   MODIFY Select_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,
   MODIFY Insert_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,
   MODIFY Update_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,

--- 1.26/scripts/mysql_create_system_tables.sh	Wed Jul 27 03:08:44 2005
+++ 1.27/scripts/mysql_create_system_tables.sh	Tue Sep 27 12:10:10 2005
@@ -123,7 +123,7 @@ then
   c_u="$c_u CREATE TABLE user ("
   c_u="$c_u   Host char(60) binary DEFAULT '' NOT NULL,"
   c_u="$c_u   User char(16) binary DEFAULT '' NOT NULL,"
-  c_u="$c_u   Password char(41) binary DEFAULT '' NOT NULL,"
+  c_u="$c_u   Password binary(41) DEFAULT '' NOT NULL,"
   c_u="$c_u   Select_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,"
   c_u="$c_u   Insert_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,"
   c_u="$c_u   Update_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,"