mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
Merge
BitKeeper/etc/logging_ok: auto-union BitKeeper/triggers/post-commit: Auto merged configure.in: Auto merged scripts/mysql_create_system_tables.sh: Auto merged sql/mysqld.cc: Auto merged sql/sql_acl.cc: Auto merged sql/sql_acl.h: Auto merged scripts/mysql_fix_privilege_tables.sql: SCCS merged
This commit is contained in:
@ -117,7 +117,6 @@ UPDATE user SET Show_db_priv= Select_priv, Super_priv=Process_priv, Execute_priv
|
||||
|
||||
-- Add fields that can be used to limit number of questions and connections
|
||||
-- for some users.
|
||||
|
||||
ALTER TABLE user
|
||||
ADD max_questions int(11) NOT NULL DEFAULT 0 AFTER x509_subject,
|
||||
ADD max_updates int(11) unsigned NOT NULL DEFAULT 0 AFTER max_questions,
|
||||
@ -135,6 +134,20 @@ ALTER TABLE host
|
||||
ADD Create_tmp_table_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,
|
||||
ADD Lock_tables_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL;
|
||||
|
||||
#
|
||||
# Create VIEWs privrlages (v5.1)
|
||||
#
|
||||
ALTER TABLE db ADD Create_view_priv enum('N','Y') DEFAULT 'N' NOT NULL AFTER Lock_tables_priv;
|
||||
ALTER TABLE host ADD Create_view_priv enum('N','Y') DEFAULT 'N' NOT NULL AFTER Lock_tables_priv;
|
||||
ALTER TABLE user ADD Create_view_priv enum('N','Y') DEFAULT 'N' NOT NULL AFTER Repl_client_priv;
|
||||
|
||||
#
|
||||
# Show VIEWs privrlages (v5.1)
|
||||
#
|
||||
ALTER TABLE db ADD Show_view_priv enum('N','Y') DEFAULT 'N' NOT NULL AFTER Create_view_priv;
|
||||
ALTER TABLE host ADD Show_view_priv enum('N','Y') DEFAULT 'N' NOT NULL AFTER Create_view_priv;
|
||||
ALTER TABLE user ADD Show_view_priv enum('N','Y') DEFAULT 'N' NOT NULL AFTER Create_view_priv;
|
||||
|
||||
alter table user change max_questions max_questions int(11) unsigned DEFAULT 0 NOT NULL;
|
||||
alter table tables_priv add KEY Grantor (Grantor);
|
||||
|
||||
|
Reference in New Issue
Block a user