bk commit into 5.0 tree (jimw:1.1837)

[jimw]

Below is the list of changes that have just been committed into a local
5.0 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://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.1837 05/02/07 18:40:14 jimw@stripped +3 -0
  Add Create_routine_priv, Alter_routine_priv, and Execute_priv privileges
  to the 'host' privilege table. (Bug #8166)

  mysql-test/r/system_mysql_db.result
    1.20 05/02/07 18:39:26 jimw@stripped +3 -0
    Update results

  scripts/mysql_create_system_tables.sh
    1.21 05/02/07 18:36:40 jimw@stripped +3 -0
    Add Create_routine_priv, Alter_routine_priv, and Execute_priv to host table

  scripts/mysql_fix_privilege_tables.sql
    1.24 05/02/04 13:05:47 jimw@stripped +4 -0
    Add Create_routine_priv, Alter_routine_priv, and Execute_priv to host table

# 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-5.0-8166

--- 1.23/scripts/mysql_fix_privilege_tables.sql	2005-01-07 10:47:40 -08:00
+++ 1.24/scripts/mysql_fix_privilege_tables.sql	2005-02-04 13:05:47 -08:00
@@ -202,21 +202,25 @@
 # Create PROCEDUREs privileges (v5.0)
 #
 ALTER TABLE db ADD Create_routine_priv enum('N','Y') DEFAULT 'N' NOT NULL AFTER
Show_view_priv;
+ALTER TABLE host ADD Create_routine_priv enum('N','Y') DEFAULT 'N' NOT NULL AFTER
Show_view_priv;
 ALTER TABLE user ADD Create_routine_priv enum('N','Y') DEFAULT 'N' NOT NULL AFTER
Show_view_priv;
 
 #
 # Alter PROCEDUREs privileges (v5.0)
 #
 ALTER TABLE db ADD Alter_routine_priv enum('N','Y') DEFAULT 'N' NOT NULL AFTER
Create_routine_priv;
+ALTER TABLE host ADD Alter_routine_priv enum('N','Y') DEFAULT 'N' NOT NULL AFTER
Create_routine_priv;
 ALTER TABLE user ADD Alter_routine_priv enum('N','Y') DEFAULT 'N' NOT NULL AFTER
Create_routine_priv;
 
 ALTER TABLE db ADD Execute_priv enum('N','Y') DEFAULT 'N' NOT NULL AFTER
Alter_routine_priv;
+ALTER TABLE host ADD Execute_priv enum('N','Y') DEFAULT 'N' NOT NULL AFTER
Alter_routine_priv;
 
 #
 # Assign create/alter routine privileges to people who have create privileges
 #
 UPDATE user SET Create_routine_priv=Create_priv, Alter_routine_priv=Alter_priv where
user<>"" AND @hadCreateRoutinePriv = 0;
 UPDATE db SET Create_routine_priv=Create_priv, Alter_routine_priv=Alter_priv,
Execute_priv=Select_priv where user<>"" AND @hadCreateRoutinePriv = 0;
+UPDATE host SET Create_routine_priv=Create_priv, Alter_routine_priv=Alter_priv,
Execute_priv=Select_priv where @hadCreateRoutinePriv = 0;
 
 #
 # Add max_user_connections resource limit 

--- 1.19/mysql-test/r/system_mysql_db.result	2005-01-03 11:04:27 -08:00
+++ 1.20/mysql-test/r/system_mysql_db.result	2005-02-07 18:39:26 -08:00
@@ -63,6 +63,9 @@
   `Lock_tables_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
   `Create_view_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
   `Show_view_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
+  `Create_routine_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
+  `Alter_routine_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
+  `Execute_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
   PRIMARY KEY  (`Host`,`Db`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='Host privileges;  Merged
with database privileges'
 show create table user;

--- 1.20/scripts/mysql_create_system_tables.sh	2004-12-29 11:35:13 -08:00
+++ 1.21/scripts/mysql_create_system_tables.sh	2005-02-07 18:36:40 -08:00
@@ -105,6 +105,9 @@
   c_h="$c_h  Lock_tables_priv enum('N','Y') DEFAULT 'N' NOT NULL,"
   c_h="$c_h  Create_view_priv enum('N','Y') DEFAULT 'N' NOT NULL,"
   c_h="$c_h  Show_view_priv enum('N','Y') DEFAULT 'N' NOT NULL,"
+  c_h="$c_h  Create_routine_priv enum('N','Y') DEFAULT 'N' NOT NULL,"
+  c_h="$c_h  Alter_routine_priv enum('N','Y') DEFAULT 'N' NOT NULL,"
+  c_h="$c_h  Execute_priv enum('N','Y') DEFAULT 'N' NOT NULL,"
   c_h="$c_h  PRIMARY KEY Host (Host,Db)"
   c_h="$c_h ) engine=MyISAM"
   c_h="$c_h CHARACTER SET utf8 COLLATE utf8_bin"