Merge mysqldev@production.mysql.com:my/mysql-5.1-release

into lmy004.:/work/mysql-5.1-release

scripts/mysql_fix_privilege_tables.sh

@@ -163,11 +163,7 @@ s_echo()
 }
 
 s_echo "This script updates all the mysql privilege tables to be usable by"
-s_echo "MySQL 4.0 and above."
-s_echo ""
-s_echo "This is needed if you want to use the new GRANT functions,"
-s_echo "CREATE AGGREGATE FUNCTION, stored procedures, or"
-s_echo "more secure passwords in 4.1"
+s_echo "MySQL 5.1 and above."
 s_echo ""
 
 if test $verbose = 1

scripts/mysql_fix_privilege_tables.sql

@@ -630,6 +630,9 @@ CREATE TABLE event (
 # EVENT privilege
 #
 
+SET @hadEventPriv := 0;
+SELECT @hadEventPriv :=1 FROM user WHERE Event_priv LIKE '%';
+
 ALTER TABLE user add Event_priv enum('N','Y') character set utf8 DEFAULT 'N' NOT NULL AFTER Create_user_priv;
 ALTER TABLE db add Event_priv enum('N','Y') character set utf8 DEFAULT 'N' NOT NULL;
 ALTER TABLE event DROP PRIMARY KEY;
@@ -667,6 +670,8 @@ ALTER TABLE event ADD sql_mode
                             'HIGH_NOT_PRECEDENCE'
                             ) DEFAULT '' NOT NULL AFTER on_completion;
 
+UPDATE user SET Event_priv=Super_priv WHERE @hadEventPriv = 0;
+
 --
 -- TRIGGER privilege
 --

sql/sql_acl.cc

@@ -471,10 +471,10 @@ static my_bool acl_load(THD *thd, TABLE_LIST *tables)
 
 
       /*
-        if it is pre 5.1.4 privilege table then map CREATE privilege on
+        if it is pre 5.1.6 privilege table then map CREATE privilege on
         CREATE|ALTER|DROP|EXECUTE EVENT
       */
-      if (table->s->fields <= 37 && (user.access & CREATE_ACL))
+      if (table->s->fields <= 37 && (user.access & SUPER_ACL))
         user.access|= EVENT_ACL;
 
       /*