bk commit into 4.1 tree (jimw:1.2459) BUG#14469

[Jim Winstead]

Below is the list of changes that have just been committed into a local
4.1 repository of jimw. When jimw 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.2459 05/10/31 15:56:52 jimw@stripped +1 -0
  Fix harmless typo in mysql_fix_privilege_tables.sql (Bug #14469)

  scripts/mysql_fix_privilege_tables.sql
    1.13 05/10/31 15:56:48 jimw@stripped +1 -1
    Remove extra leading - in comment

# 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:	jimw
# Host:	rama.(none)
# Root:	/home/jimw/my/mysql-4.1-14469

--- 1.12/scripts/mysql_fix_privilege_tables.sql	2005-04-15 18:12:22 -07:00
+++ 1.13/scripts/mysql_fix_privilege_tables.sql	2005-10-31 15:56:48 -08:00
@@ -29,7 +29,7 @@
 ALTER TABLE host add Grant_priv enum('N','Y') NOT NULL,add References_priv enum('N','Y')
COLLATE utf8_general_ci NOT NULL,add Index_priv enum('N','Y') COLLATE utf8_general_ci NOT
NULL,add Alter_priv enum('N','Y') COLLATE utf8_general_ci NOT NULL;
 ALTER TABLE db add Grant_priv enum('N','Y') COLLATE utf8_general_ci NOT NULL,add
References_priv enum('N','Y') COLLATE utf8_general_ci NOT NULL,add Index_priv
enum('N','Y') COLLATE utf8_general_ci NOT NULL,add Alter_priv enum('N','Y') COLLATE
utf8_general_ci NOT NULL;
 
---- Fix privileges for old tables
+-- Fix privileges for old tables
 UPDATE user SET
Grant_priv=File_priv,References_priv=Create_priv,Index_priv=Create_priv,Alter_priv=Create_priv
WHERE @hadGrantPriv = 0;
 UPDATE db SET References_priv=Create_priv,Index_priv=Create_priv,Alter_priv=Create_priv
WHERE @hadGrantPriv = 0;
 UPDATE host SET References_priv=Create_priv,Index_priv=Create_priv,Alter_priv=Create_priv
WHERE @hadGrantPriv = 0;