Commit 87b7e20e authored by unknown's avatar unknown
Browse files

init_db.sql: 

  add new table privileges
Makefile.am:
  Include path to regex dir was accidently removed


sql/Makefile.am:
  Include path to regex dir was accidently removed
mysql-test/lib/init_db.sql:
  add new table privileges
parent cf297f60

mysql-test/lib/init_db.sql

+1 −1
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ CREATE TABLE tables_priv ( 
  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

sql/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ MYSQLBASEdir= $(prefix) 
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