bk commit into 4.1 tree (msvensson:1.2557) BUG#20589

[msvensson]

Below is the list of changes that have just been committed into a local
4.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, 2006-11-22 09:52:31+01:00, msvensson@neptunus.(none) +1 -0
  Bug #20589 Missing some table level privileges after upgrade
  - Update comments to reflect correct version 

  scripts/mysql_fix_privilege_tables.sql@stripped, 2006-11-22 09:52:29+01:00,
msvensson@neptunus.(none) +2 -2
    Update comments to reflect correct version 

# 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:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/bug20589/my41-bug20589

--- 1.13/scripts/mysql_fix_privilege_tables.sql	2006-11-22 09:52:34 +01:00
+++ 1.14/scripts/mysql_fix_privilege_tables.sql	2006-11-22 09:52:34 +01:00
@@ -1,5 +1,5 @@
 -- This script converts any old privilege tables to privilege tables suitable
--- for MySQL 4.0.
+-- for MySQL 4.1
 
 -- You can safely ignore all 'Duplicate column' and 'Unknown column' errors"
 -- because these just mean that your tables are already up to date.
@@ -93,7 +93,7 @@ ALTER TABLE columns_priv change Type Col
 ALTER TABLE func add type enum ('function','aggregate') COLLATE utf8_general_ci NOT NULL;
 
 --
---  Change the user,db and host tables to MySQL 4.0 format
+--  Change the user,db and host tables to current format
 --
 
 # Detect whether we had Show_db_priv