mirror of
https://github.com/MariaDB/server.git
synced 2025-12-24 11:21:21 +03:00
manual merge
This commit is contained in:
@@ -134,6 +134,36 @@
|
||||
(((A) & ALTER_PROC_ACL) >> 23) | \
|
||||
(((A) & GRANT_ACL) >> 8))
|
||||
|
||||
enum mysql_db_table_field
|
||||
{
|
||||
MYSQL_DB_FIELD_HOST = 0,
|
||||
MYSQL_DB_FIELD_DB,
|
||||
MYSQL_DB_FIELD_USER,
|
||||
MYSQL_DB_FIELD_SELECT_PRIV,
|
||||
MYSQL_DB_FIELD_INSERT_PRIV,
|
||||
MYSQL_DB_FIELD_UPDATE_PRIV,
|
||||
MYSQL_DB_FIELD_DELETE_PRIV,
|
||||
MYSQL_DB_FIELD_CREATE_PRIV,
|
||||
MYSQL_DB_FIELD_DROP_PRIV,
|
||||
MYSQL_DB_FIELD_GRANT_PRIV,
|
||||
MYSQL_DB_FIELD_REFERENCES_PRIV,
|
||||
MYSQL_DB_FIELD_INDEX_PRIV,
|
||||
MYSQL_DB_FIELD_ALTER_PRIV,
|
||||
MYSQL_DB_FIELD_CREATE_TMP_TABLE_PRIV,
|
||||
MYSQL_DB_FIELD_LOCK_TABLES_PRIV,
|
||||
MYSQL_DB_FIELD_CREATE_VIEW_PRIV,
|
||||
MYSQL_DB_FIELD_SHOW_VIEW_PRIV,
|
||||
MYSQL_DB_FIELD_CREATE_ROUTINE_PRIV,
|
||||
MYSQL_DB_FIELD_ALTER_ROUTINE_PRIV,
|
||||
MYSQL_DB_FIELD_EXECUTE_PRIV,
|
||||
MYSQL_DB_FIELD_EVENT_PRIV,
|
||||
MYSQL_DB_FIELD_TRIGGER_PRIV,
|
||||
MYSQL_DB_FIELD_COUNT
|
||||
};
|
||||
|
||||
extern TABLE_FIELD_W_TYPE mysql_db_table_fields[];
|
||||
extern time_t mysql_db_table_last_check;
|
||||
|
||||
/* Classes */
|
||||
|
||||
struct acl_host_and_ip
|
||||
|
||||
Reference in New Issue
Block a user