mirror of
https://github.com/MariaDB/server.git
synced 2025-08-07 00:04:31 +03:00
init_db.sql:
add new table privileges Makefile.am: Include path to regex dir was accidently removed
This commit is contained in:
@@ -128,7 +128,7 @@ CREATE TABLE tables_priv (
|
|||||||
Table_name char(64) binary DEFAULT '' NOT NULL,
|
Table_name char(64) binary DEFAULT '' NOT NULL,
|
||||||
Grantor char(77) DEFAULT '' NOT NULL,
|
Grantor char(77) DEFAULT '' NOT NULL,
|
||||||
Timestamp timestamp(14),
|
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,
|
Column_priv set('Select','Insert','Update','References') COLLATE utf8_general_ci DEFAULT '' NOT NULL,
|
||||||
PRIMARY KEY (Host,Db,User,Table_name),KEY Grantor (Grantor)
|
PRIMARY KEY (Host,Db,User,Table_name),KEY Grantor (Grantor)
|
||||||
) engine=MyISAM
|
) engine=MyISAM
|
||||||
|
@@ -22,7 +22,7 @@ MYSQLBASEdir= $(prefix)
|
|||||||
INCLUDES = @ZLIB_INCLUDES@ \
|
INCLUDES = @ZLIB_INCLUDES@ \
|
||||||
@bdb_includes@ @innodb_includes@ @ndbcluster_includes@ \
|
@bdb_includes@ @innodb_includes@ @ndbcluster_includes@ \
|
||||||
-I$(top_builddir)/include -I$(top_srcdir)/include \
|
-I$(top_builddir)/include -I$(top_srcdir)/include \
|
||||||
-I$(srcdir) $(openssl_includes)
|
-I$(top_srcdir)/regex -I$(srcdir) $(openssl_includes)
|
||||||
WRAPLIBS= @WRAPLIBS@
|
WRAPLIBS= @WRAPLIBS@
|
||||||
SUBDIRS = share
|
SUBDIRS = share
|
||||||
libexec_PROGRAMS = mysqld
|
libexec_PROGRAMS = mysqld
|
||||||
|
Reference in New Issue
Block a user