bk commit into 5.0 tree (kent:1.1916)

[kent]

Below is the list of changes that have just been committed into a local
5.0 repository of kent. When kent 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.1916 05/05/26 02:07:13 kent@stripped +1 -0
  init_db.sql:
    Updated test data in system tables

  mysql-test/lib/init_db.sql
    1.8 05/05/26 02:06:25 kent@stripped +6 -2
    Updated test data in system tables

# 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:	kent
# Host:	g4.boortz.dyndns.org
# Root:	/Users/kent/mysql/bk/mysql-5.0

--- 1.7/mysql-test/lib/init_db.sql	2005-05-15 07:38:27 +02:00
+++ 1.8/mysql-test/lib/init_db.sql	2005-05-26 02:06:25 +02:00
@@ -50,6 +50,9 @@
   Lock_tables_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,
   Create_view_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,
   Show_view_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,
+  Create_routine_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,
+  Alter_routine_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,
+  Execute_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,
   PRIMARY KEY Host (Host,Db)
 ) engine=MyISAM
 CHARACTER SET utf8 COLLATE utf8_bin
@@ -489,10 +492,11 @@
   Db char(64) binary DEFAULT '' NOT NULL,
   User char(16) binary DEFAULT '' NOT NULL,
   Routine_name char(64) binary DEFAULT '' NOT NULL,
+  Routine_type enum('FUNCTION','PROCEDURE') NOT NULL,
   Grantor char(77) DEFAULT '' NOT NULL,
-  Timestamp timestamp(14),
   Proc_priv set('Execute','Alter Routine','Grant') COLLATE utf8_general_ci DEFAULT '' NOT NULL,
-  PRIMARY KEY (Host,Db,User,Routine_name),
+  Timestamp timestamp(14),
+  PRIMARY KEY (Host,Db,User,Routine_name,Routine_type),
   KEY Grantor (Grantor)
 ) engine=MyISAM
 CHARACTER SET utf8 COLLATE utf8_bin