bk commit into 5.0 tree (kent:1.1893)

[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.1893 05/07/06 10:16:36 kent@stripped +2 -0
  init_db.sql:
    add new table privileges
  Makefile.am:
    Include path to regex dir was accidently removed

  mysql-test/lib/init_db.sql
    1.9 05/07/06 10:11:53 kent@stripped +1 -1
    add new table privileges

  sql/Makefile.am
    1.108 05/07/06 10:01:52 kent@stripped +1 -1
    Include path to regex dir was accidently removed

# 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-2.local
# Root:	/Users/kent/mysql/bk/mysql-5.0

--- 1.107/sql/Makefile.am	2005-07-06 00:03:27 +02:00
+++ 1.108/sql/Makefile.am	2005-07-06 10:01:52 +02:00
@@ -22,7 +22,7 @@
 INCLUDES =		@ZLIB_INCLUDES@ \
 			@bdb_includes@ @innodb_includes@ @ndbcluster_includes@ \
 			-I$(top_builddir)/include -I$(top_srcdir)/include \
-			-I$(srcdir) $(openssl_includes)
+			-I$(top_srcdir)/regex -I$(srcdir) $(openssl_includes)
 WRAPLIBS=		@WRAPLIBS@
 SUBDIRS =		share
 libexec_PROGRAMS =	mysqld

--- 1.8/mysql-test/lib/init_db.sql	2005-05-26 02:06:25 +02:00
+++ 1.9/mysql-test/lib/init_db.sql	2005-07-06 10:11:53 +02:00
@@ -128,7 +128,7 @@
   Table_name char(64) binary DEFAULT '' NOT NULL,
   Grantor char(77) DEFAULT '' NOT NULL,
   Timestamp timestamp(14),
-  Table_priv
set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter')
COLLATE utf8_general_ci DEFAULT '' NOT NULL,
+  Table_priv
set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter','Create
View','Show view') COLLATE utf8_general_ci DEFAULT '' NOT NULL,
   Column_priv set('Select','Insert','Update','References') COLLATE utf8_general_ci
DEFAULT '' NOT NULL,
   PRIMARY KEY (Host,Db,User,Table_name),KEY Grantor (Grantor)
 ) engine=MyISAM