Skip to content

M
MariaDB
Commit 517b1f4f authored by Sergei Golubchik's avatar Sergei Golubchik
Browse files
Options

cleanups: 

* comments from WL#5602 in sql_acl.cc
* rename global memroots in sql_acl.cc
* remove the second empty lex string constant
parent 93b15559
Hide whitespace changes
Inline Side-by-side
Showing with 119 additions and 120 deletions
sql/sql_acl.cc
View file @ 517b1f4f
...@@ -722,7 +722,7 @@ static HASH acl_roles; ...@@ -722,7 +722,7 @@ static HASH acl_roles;
The hashkey used represents all the entries combined The hashkey used represents all the entries combined
*/ */
static HASH acl_roles_mappings; static HASH acl_roles_mappings;
static MEM_ROOT mem, memex; static MEM_ROOT acl_memroot, grant_memroot;
static bool initialized=0; static bool initialized=0;
static bool allow_all_hosts=1; static bool allow_all_hosts=1;
static HASH acl_check_hosts, column_priv_hash, proc_priv_hash, func_priv_hash; static HASH acl_check_hosts, column_priv_hash, proc_priv_hash, func_priv_hash;
...@@ -819,9 +819,16 @@ static void free_acl_role(ACL_ROLE *role) ...@@ -819,9 +819,16 @@ static void free_acl_role(ACL_ROLE *role)
delete_dynamic(&(role->parent_grantee)); delete_dynamic(&(role->parent_grantee));
} }
/* /**
Convert scrambled password to binary form, according to scramble type, Convert scrambled password to binary form, according to scramble type,
Binary form is stored in user.salt. Binary form is stored in user.salt.
@param acl_user The object where to store the salt
@param password The password hash containing the salt
@param password_len The length of the password hash
Despite the name of the function it is used when loading ACLs from disk
to store the password hash in the ACL_USER object.
*/ */
static void static void
...@@ -1013,7 +1020,7 @@ static my_bool acl_load(THD *thd, TABLE_LIST *tables) ...@@ -1013,7 +1020,7 @@ static my_bool acl_load(THD *thd, TABLE_LIST *tables)
grant_version++; /* Privileges updated */ grant_version++; /* Privileges updated */
init_sql_alloc(&mem, ACL_ALLOC_BLOCK_SIZE, 0, MYF(0)); init_sql_alloc(&acl_memroot, ACL_ALLOC_BLOCK_SIZE, 0, MYF(0));
(void) my_init_dynamic_array(&acl_hosts,sizeof(ACL_HOST), 20, 50, MYF(0)); (void) my_init_dynamic_array(&acl_hosts,sizeof(ACL_HOST), 20, 50, MYF(0));
if (tables[0].table) // "host" table may not exist (e.g. in MySQL 5.6.7+) if (tables[0].table) // "host" table may not exist (e.g. in MySQL 5.6.7+)
{ {
...@@ -1024,8 +1031,8 @@ static my_bool acl_load(THD *thd, TABLE_LIST *tables) ...@@ -1024,8 +1031,8 @@ static my_bool acl_load(THD *thd, TABLE_LIST *tables)
while (!(read_record_info.read_record(&read_record_info))) while (!(read_record_info.read_record(&read_record_info)))
{ {
ACL_HOST host; ACL_HOST host;
update_hostname(&host.host,get_field(&mem, table->field[0])); update_hostname(&host.host,get_field(&acl_memroot, table->field[0]));
host.db= get_field(&mem, table->field[1]); host.db= get_field(&acl_memroot, table->field[1]);
if (lower_case_table_names && host.db) if (lower_case_table_names && host.db)
{ {
/* /*
...@@ -1130,8 +1137,8 @@ static my_bool acl_load(THD *thd, TABLE_LIST *tables) ...@@ -1130,8 +1137,8 @@ static my_bool acl_load(THD *thd, TABLE_LIST *tables)
ACL_USER user; ACL_USER user;
bool is_role= FALSE; bool is_role= FALSE;
bzero(&user, sizeof(user)); bzero(&user, sizeof(user));
update_hostname(&user.host, get_field(&mem, table->field[0])); update_hostname(&user.host, get_field(&acl_memroot, table->field[0]));
char *username= get_field(&mem, table->field[1]); char *username= get_field(&acl_memroot, table->field[1]);
user.user.str= username; user.user.str= username;
user.user.length= username? strlen(username) : 0; user.user.length= username? strlen(username) : 0;
...@@ -1157,7 +1164,7 @@ static my_bool acl_load(THD *thd, TABLE_LIST *tables) ...@@ -1157,7 +1164,7 @@ static my_bool acl_load(THD *thd, TABLE_LIST *tables)
continue; continue;
} }
char *password= get_field(&mem, table->field[2]); char *password= get_field(&acl_memroot, table->field[2]);
uint password_len= password ? strlen(password) : 0; uint password_len= password ? strlen(password) : 0;
user.auth_string.str= safe_str(password); user.auth_string.str= safe_str(password);
user.auth_string.length= password_len; user.auth_string.length= password_len;
...@@ -1222,9 +1229,9 @@ static my_bool acl_load(THD *thd, TABLE_LIST *tables) ...@@ -1222,9 +1229,9 @@ static my_bool acl_load(THD *thd, TABLE_LIST *tables)
else /* !strcmp(ssl_type, "SPECIFIED") */ else /* !strcmp(ssl_type, "SPECIFIED") */
user.ssl_type=SSL_TYPE_SPECIFIED; user.ssl_type=SSL_TYPE_SPECIFIED;
user.ssl_cipher= get_field(&mem, table->field[next_field++]); user.ssl_cipher= get_field(&acl_memroot, table->field[next_field++]);
user.x509_issuer= get_field(&mem, table->field[next_field++]); user.x509_issuer= get_field(&acl_memroot, table->field[next_field++]);
user.x509_subject= get_field(&mem, table->field[next_field++]); user.x509_subject= get_field(&acl_memroot, table->field[next_field++]);
char *ptr = get_field(thd->mem_root, table->field[next_field++]); char *ptr = get_field(thd->mem_root, table->field[next_field++]);
user.user_resource.questions=ptr ? atoi(ptr) : 0; user.user_resource.questions=ptr ? atoi(ptr) : 0;
...@@ -1246,7 +1253,7 @@ static my_bool acl_load(THD *thd, TABLE_LIST *tables) ...@@ -1246,7 +1253,7 @@ static my_bool acl_load(THD *thd, TABLE_LIST *tables)
if (!is_role && table->s->fields >= 41) if (!is_role && table->s->fields >= 41)
{ {
/* We may have plugin & auth_String fields */ /* We may have plugin & auth_String fields */
char *tmpstr= get_field(&mem, table->field[next_field++]); char *tmpstr= get_field(&acl_memroot, table->field[next_field++]);
if (tmpstr) if (tmpstr)
{ {
user.plugin.str= tmpstr; user.plugin.str= tmpstr;
...@@ -1260,7 +1267,7 @@ static my_bool acl_load(THD *thd, TABLE_LIST *tables) ...@@ -1260,7 +1267,7 @@ static my_bool acl_load(THD *thd, TABLE_LIST *tables)
safe_str(user.host.hostname)); safe_str(user.host.hostname));
} }
user.auth_string.str= user.auth_string.str=
safe_str(get_field(&mem, table->field[next_field++])); safe_str(get_field(&acl_memroot, table->field[next_field++]));
user.auth_string.length= strlen(user.auth_string.str); user.auth_string.length= strlen(user.auth_string.str);
fix_user_plugin_ptr(&user); fix_user_plugin_ptr(&user);
...@@ -1291,7 +1298,7 @@ static my_bool acl_load(THD *thd, TABLE_LIST *tables) ...@@ -1291,7 +1298,7 @@ static my_bool acl_load(THD *thd, TABLE_LIST *tables)
if (is_role) if (is_role)
{ {
DBUG_PRINT("info", ("Found role %s", user.user.str)); DBUG_PRINT("info", ("Found role %s", user.user.str));
ACL_ROLE *entry= new (&mem) ACL_ROLE(&user, &mem); ACL_ROLE *entry= new (&acl_memroot) ACL_ROLE(&user, &acl_memroot);
entry->role_grants = user.role_grants; entry->role_grants = user.role_grants;
(void) my_init_dynamic_array(&entry->parent_grantee, (void) my_init_dynamic_array(&entry->parent_grantee,
sizeof(ACL_USER_BASE *), 8, 8, MYF(0)); sizeof(ACL_USER_BASE *), 8, 8, MYF(0));
...@@ -1322,12 +1329,12 @@ static my_bool acl_load(THD *thd, TABLE_LIST *tables) ...@@ -1322,12 +1329,12 @@ static my_bool acl_load(THD *thd, TABLE_LIST *tables)
while (!(read_record_info.read_record(&read_record_info))) while (!(read_record_info.read_record(&read_record_info)))
{ {
ACL_DB db; ACL_DB db;
db.user=get_field(&mem, table->field[MYSQL_DB_FIELD_USER]); db.user=get_field(&acl_memroot, table->field[MYSQL_DB_FIELD_USER]);
const char *hostname= get_field(&mem, table->field[MYSQL_DB_FIELD_HOST]); const char *hostname= get_field(&acl_memroot, table->field[MYSQL_DB_FIELD_HOST]);
if (!hostname && find_acl_role(db.user)) if (!hostname && find_acl_role(db.user))
hostname= ""; hostname= "";
update_hostname(&db.host, hostname); update_hostname(&db.host, hostname);
db.db=get_field(&mem, table->field[MYSQL_DB_FIELD_DB]); db.db=get_field(&acl_memroot, table->field[MYSQL_DB_FIELD_DB]);
if (!db.db) if (!db.db)
{ {
sql_print_warning("Found an entry in the 'db' table with empty database name; Skipped"); sql_print_warning("Found an entry in the 'db' table with empty database name; Skipped");
...@@ -1391,7 +1398,7 @@ static my_bool acl_load(THD *thd, TABLE_LIST *tables) ...@@ -1391,7 +1398,7 @@ static my_bool acl_load(THD *thd, TABLE_LIST *tables)
while (!(read_record_info.read_record(&read_record_info))) while (!(read_record_info.read_record(&read_record_info)))
{ {
ACL_PROXY_USER proxy; ACL_PROXY_USER proxy;
proxy.init(table, &mem); proxy.init(table, &acl_memroot);
if (proxy.check_validity(check_no_resolve)) if (proxy.check_validity(check_no_resolve))
continue; continue;
if (push_dynamic(&acl_proxy_users, (uchar*) &proxy)) if (push_dynamic(&acl_proxy_users, (uchar*) &proxy))
...@@ -1437,9 +1444,9 @@ static my_bool acl_load(THD *thd, TABLE_LIST *tables) ...@@ -1437,9 +1444,9 @@ static my_bool acl_load(THD *thd, TABLE_LIST *tables)
continue; continue;
} }
ROLE_GRANT_PAIR *mapping= new (&mem) ROLE_GRANT_PAIR; ROLE_GRANT_PAIR *mapping= new (&acl_memroot) ROLE_GRANT_PAIR;
if (mapping->init(&mem, username, hostname, rolename, with_grant_option)) if (mapping->init(&acl_memroot, username, hostname, rolename, with_grant_option))
continue; continue;
my_hash_insert(&acl_roles_mappings, (uchar*) mapping); my_hash_insert(&acl_roles_mappings, (uchar*) mapping);
...@@ -1468,7 +1475,7 @@ static my_bool acl_load(THD *thd, TABLE_LIST *tables) ...@@ -1468,7 +1475,7 @@ static my_bool acl_load(THD *thd, TABLE_LIST *tables)
void acl_free(bool end) void acl_free(bool end)
{ {
my_hash_free(&acl_roles); my_hash_free(&acl_roles);
free_root(&mem,MYF(0)); free_root(&acl_memroot,MYF(0));
delete_dynamic(&acl_hosts); delete_dynamic(&acl_hosts);
delete_dynamic_with_callback(&acl_users, (FREE_FUNC) free_acl_user); delete_dynamic_with_callback(&acl_users, (FREE_FUNC) free_acl_user);
delete_dynamic(&acl_dbs); delete_dynamic(&acl_dbs);
...@@ -1562,7 +1569,7 @@ my_bool acl_reload(THD *thd) ...@@ -1562,7 +1569,7 @@ my_bool acl_reload(THD *thd)
old_acl_roles_mappings= acl_roles_mappings; old_acl_roles_mappings= acl_roles_mappings;
old_acl_proxy_users= acl_proxy_users; old_acl_proxy_users= acl_proxy_users;
old_acl_dbs= acl_dbs; old_acl_dbs= acl_dbs;
old_mem= mem; old_mem= acl_memroot;
delete_dynamic(&acl_wild_hosts); delete_dynamic(&acl_wild_hosts);
my_hash_free(&acl_check_hosts); my_hash_free(&acl_check_hosts);
...@@ -1576,7 +1583,7 @@ my_bool acl_reload(THD *thd) ...@@ -1576,7 +1583,7 @@ my_bool acl_reload(THD *thd)
acl_roles_mappings= old_acl_roles_mappings; acl_roles_mappings= old_acl_roles_mappings;
acl_proxy_users= old_acl_proxy_users; acl_proxy_users= old_acl_proxy_users;
acl_dbs= old_acl_dbs; acl_dbs= old_acl_dbs;
mem= old_mem; acl_memroot= old_mem;
init_check_host(); init_check_host();
} }
else else
...@@ -1960,15 +1967,15 @@ static void acl_update_user(const char *user, const char *host, ...@@ -1960,15 +1967,15 @@ static void acl_update_user(const char *user, const char *host,
{ {
acl_user->plugin= *plugin; acl_user->plugin= *plugin;
acl_user->auth_string.str= auth->str ? acl_user->auth_string.str= auth->str ?
strmake_root(&mem, auth->str, auth->length) : const_cast<char*>(""); strmake_root(&acl_memroot, auth->str, auth->length) : const_cast<char*>("");
acl_user->auth_string.length= auth->length; acl_user->auth_string.length= auth->length;
if (fix_user_plugin_ptr(acl_user)) if (fix_user_plugin_ptr(acl_user))
acl_user->plugin.str= strmake_root(&mem, plugin->str, plugin->length); acl_user->plugin.str= strmake_root(&acl_memroot, plugin->str, plugin->length);
} }
else else
if (password[0]) if (password[0])
{ {
acl_user->auth_string.str= strmake_root(&mem, password, password_len); acl_user->auth_string.str= strmake_root(&acl_memroot, password, password_len);
acl_user->auth_string.length= password_len; acl_user->auth_string.length= password_len;
set_user_salt(acl_user, password, password_len); set_user_salt(acl_user, password, password_len);
set_user_plugin(acl_user, password_len); set_user_plugin(acl_user, password_len);
...@@ -1985,12 +1992,12 @@ static void acl_update_user(const char *user, const char *host, ...@@ -1985,12 +1992,12 @@ static void acl_update_user(const char *user, const char *host,
if (ssl_type != SSL_TYPE_NOT_SPECIFIED) if (ssl_type != SSL_TYPE_NOT_SPECIFIED)
{ {
acl_user->ssl_type= ssl_type; acl_user->ssl_type= ssl_type;
acl_user->ssl_cipher= (ssl_cipher ? strdup_root(&mem,ssl_cipher) : acl_user->ssl_cipher= (ssl_cipher ? strdup_root(&acl_memroot,ssl_cipher) :
0); 0);
acl_user->x509_issuer= (x509_issuer ? strdup_root(&mem,x509_issuer) : acl_user->x509_issuer= (x509_issuer ? strdup_root(&acl_memroot,x509_issuer) :
0); 0);
acl_user->x509_subject= (x509_subject ? acl_user->x509_subject= (x509_subject ?
strdup_root(&mem,x509_subject) : 0); strdup_root(&acl_memroot,x509_subject) : 0);
} }
/* search complete: */ /* search complete: */
break; break;
...@@ -2004,7 +2011,7 @@ static void acl_insert_role(const char *rolename, ulong privileges) ...@@ -2004,7 +2011,7 @@ static void acl_insert_role(const char *rolename, ulong privileges)
ACL_ROLE *entry; ACL_ROLE *entry;
mysql_mutex_assert_owner(&acl_cache->lock); mysql_mutex_assert_owner(&acl_cache->lock);
entry= new (&mem) ACL_ROLE(rolename, privileges, &mem); entry= new (&acl_memroot) ACL_ROLE(rolename, privileges, &acl_memroot);
(void) my_init_dynamic_array(&entry->parent_grantee, (void) my_init_dynamic_array(&entry->parent_grantee,
sizeof(ACL_USER_BASE *), 8, 8, MYF(0)); sizeof(ACL_USER_BASE *), 8, 8, MYF(0));
(void) my_init_dynamic_array(&entry->role_grants,sizeof(ACL_ROLE *), (void) my_init_dynamic_array(&entry->role_grants,sizeof(ACL_ROLE *),
...@@ -2029,21 +2036,21 @@ static void acl_insert_user(const char *user, const char *host, ...@@ -2029,21 +2036,21 @@ static void acl_insert_user(const char *user, const char *host,
mysql_mutex_assert_owner(&acl_cache->lock); mysql_mutex_assert_owner(&acl_cache->lock);
acl_user.user.str=*user ? strdup_root(&mem,user) : 0; acl_user.user.str=*user ? strdup_root(&acl_memroot,user) : 0;
acl_user.user.length= strlen(user); acl_user.user.length= strlen(user);
update_hostname(&acl_user.host, safe_strdup_root(&mem, host)); update_hostname(&acl_user.host, safe_strdup_root(&acl_memroot, host));
if (plugin->str[0]) if (plugin->str[0])
{ {
acl_user.plugin= *plugin; acl_user.plugin= *plugin;
acl_user.auth_string.str= auth->str ? acl_user.auth_string.str= auth->str ?
strmake_root(&mem, auth->str, auth->length) : const_cast<char*>(""); strmake_root(&acl_memroot, auth->str, auth->length) : const_cast<char*>("");
acl_user.auth_string.length= auth->length; acl_user.auth_string.length= auth->length;
if (fix_user_plugin_ptr(&acl_user)) if (fix_user_plugin_ptr(&acl_user))
acl_user.plugin.str= strmake_root(&mem, plugin->str, plugin->length); acl_user.plugin.str= strmake_root(&acl_memroot, plugin->str, plugin->length);
} }
else else
{ {
acl_user.auth_string.str= strmake_root(&mem, password, password_len); acl_user.auth_string.str= strmake_root(&acl_memroot, password, password_len);
acl_user.auth_string.length= password_len; acl_user.auth_string.length= password_len;
set_user_salt(&acl_user, password, password_len); set_user_salt(&acl_user, password, password_len);
set_user_plugin(&acl_user, password_len); set_user_plugin(&acl_user, password_len);
...@@ -2056,9 +2063,9 @@ static void acl_insert_user(const char *user, const char *host, ...@@ -2056,9 +2063,9 @@ static void acl_insert_user(const char *user, const char *host,
acl_user.hostname_length=(uint) strlen(host); acl_user.hostname_length=(uint) strlen(host);
acl_user.ssl_type= (ssl_type != SSL_TYPE_NOT_SPECIFIED ? acl_user.ssl_type= (ssl_type != SSL_TYPE_NOT_SPECIFIED ?
ssl_type : SSL_TYPE_NONE); ssl_type : SSL_TYPE_NONE);
acl_user.ssl_cipher= ssl_cipher ? strdup_root(&mem,ssl_cipher) : 0; acl_user.ssl_cipher= ssl_cipher ? strdup_root(&acl_memroot,ssl_cipher) : 0;
acl_user.x509_issuer= x509_issuer ? strdup_root(&mem,x509_issuer) : 0; acl_user.x509_issuer= x509_issuer ? strdup_root(&acl_memroot,x509_issuer) : 0;
acl_user.x509_subject=x509_subject ? strdup_root(&mem,x509_subject) : 0; acl_user.x509_subject=x509_subject ? strdup_root(&acl_memroot,x509_subject) : 0;
(void) my_init_dynamic_array(&acl_user.role_grants, sizeof(ACL_USER *), (void) my_init_dynamic_array(&acl_user.role_grants, sizeof(ACL_USER *),
8, 8, MYF(0)); 8, 8, MYF(0));
...@@ -2133,9 +2140,9 @@ static void acl_insert_db(const char *user, const char *host, const char *db, ...@@ -2133,9 +2140,9 @@ static void acl_insert_db(const char *user, const char *host, const char *db,
{ {
ACL_DB acl_db; ACL_DB acl_db;
mysql_mutex_assert_owner(&acl_cache->lock); mysql_mutex_assert_owner(&acl_cache->lock);
acl_db.user=strdup_root(&mem,user); acl_db.user=strdup_root(&acl_memroot,user);
update_hostname(&acl_db.host, safe_strdup_root(&mem, host)); update_hostname(&acl_db.host, safe_strdup_root(&acl_memroot, host));
acl_db.db=strdup_root(&mem,db); acl_db.db=strdup_root(&acl_memroot,db);
acl_db.initial_access= acl_db.access= privileges; acl_db.initial_access= acl_db.access= privileges;
acl_db.sort=get_sort(3,acl_db.host.hostname,acl_db.db,acl_db.user); acl_db.sort=get_sort(3,acl_db.host.hostname,acl_db.db,acl_db.user);
(void) push_dynamic(&acl_dbs,(uchar*) &acl_db); (void) push_dynamic(&acl_dbs,(uchar*) &acl_db);
...@@ -2481,22 +2488,20 @@ bool acl_check_host(const char *host, const char *ip) ...@@ -2481,22 +2488,20 @@ bool acl_check_host(const char *host, const char *ip)
} }
/* /**
Check if the user is allowed to change password Check if the user is allowed to change password
SYNOPSIS: @param thd THD
check_change_password() @param host Hostname for the user
thd THD @param user User name
host hostname for the user @param new_password New password
user user name @param new_password_len The length of the new password
new_password new password
NOTE: new_password cannot be NULL
new_password cannot be NULL
RETURN VALUE @return Error status
0 OK @retval 0 OK
1 ERROR ; In this case the error is sent to the client. @retval 1 ERROR; In this case the error is sent to the client.
*/ */
int check_change_password(THD *thd, const char *host, const char *user, int check_change_password(THD *thd, const char *host, const char *user,
...@@ -2537,21 +2542,18 @@ int check_change_password(THD *thd, const char *host, const char *user, ...@@ -2537,21 +2542,18 @@ int check_change_password(THD *thd, const char *host, const char *user,
} }
/* /**
Change a password for a user Change a password for a user.
SYNOPSIS
change_password()
thd Thread handle
host Hostname
user User name
new_password New password for host@user
RETURN VALUES @param thd THD
0 ok @param host Hostname
1 ERROR; In this case the error is sent to the client. @param user User name
@param new_password New password hash for host@user
@return Error code
@retval 0 ok
@retval 1 ERROR; In this case the error is sent to the client.
*/ */
bool change_password(THD *thd, const char *host, const char *user, bool change_password(THD *thd, const char *host, const char *user,
char *new_password) char *new_password)
{ {
...@@ -2616,7 +2618,7 @@ bool change_password(THD *thd, const char *host, const char *user, ...@@ -2616,7 +2618,7 @@ bool change_password(THD *thd, const char *host, const char *user,
if (acl_user->plugin.str == native_password_plugin_name.str || if (acl_user->plugin.str == native_password_plugin_name.str ||
acl_user->plugin.str == old_password_plugin_name.str) acl_user->plugin.str == old_password_plugin_name.str)
{ {
acl_user->auth_string.str= strmake_root(&mem, new_password, new_password_len); acl_user->auth_string.str= strmake_root(&acl_memroot, new_password, new_password_len);
acl_user->auth_string.length= new_password_len; acl_user->auth_string.length= new_password_len;
set_user_salt(acl_user, new_password, new_password_len); set_user_salt(acl_user, new_password, new_password_len);
set_user_plugin(acl_user, new_password_len); set_user_plugin(acl_user, new_password_len);
...@@ -2909,17 +2911,17 @@ bool hostname_requires_resolving(const char *hostname) ...@@ -2909,17 +2911,17 @@ bool hostname_requires_resolving(const char *hostname)
} }
/* /**
Update record for user in mysql.user privilege table with new password. Update record for user in mysql.user privilege table with new password.
SYNOPSIS @param thd THD
update_user_table() @param table Pointer to TABLE object for open mysql.user table
thd Thread handle @param host Hostname
table Pointer to TABLE object for open mysql.user table @param user Username
host/user Hostname/username pair identifying user for which @param new_password New password hash
new password should be set @param new_password_len Length of new password hash
new_password New password
new_password_len Length of new password @see change_password
*/ */
static bool update_user_table(THD *thd, TABLE *table, static bool update_user_table(THD *thd, TABLE *table,
...@@ -3470,8 +3472,8 @@ replace_roles_mapping_table(TABLE *table, LEX_STRING *user, LEX_STRING *host, ...@@ -3470,8 +3472,8 @@ replace_roles_mapping_table(TABLE *table, LEX_STRING *user, LEX_STRING *host,
else else
{ {
/* allocate a new entry that will go in the hash */ /* allocate a new entry that will go in the hash */
ROLE_GRANT_PAIR *hash_entry= new (&mem) ROLE_GRANT_PAIR; ROLE_GRANT_PAIR *hash_entry= new (&acl_memroot) ROLE_GRANT_PAIR;
if (hash_entry->init(&mem, user->str, host->str, role->str, with_admin)) if (hash_entry->init(&acl_memroot, user->str, host->str, role->str, with_admin))
DBUG_RETURN(1); DBUG_RETURN(1);
my_hash_insert(&acl_roles_mappings, (uchar*) hash_entry); my_hash_insert(&acl_roles_mappings, (uchar*) hash_entry);
} }
...@@ -3628,7 +3630,7 @@ replace_proxies_priv_table(THD *thd, TABLE *table, const LEX_USER *user, ...@@ -3628,7 +3630,7 @@ replace_proxies_priv_table(THD *thd, TABLE *table, const LEX_USER *user,
} }
else else
{ {
new_grant.init(&mem, user->host.str, user->user.str, new_grant.init(&acl_memroot, user->host.str, user->user.str,
proxied_user->host.str, proxied_user->user.str, proxied_user->host.str, proxied_user->user.str,
with_grant_arg); with_grant_arg);
acl_insert_proxy_user(&new_grant); acl_insert_proxy_user(&new_grant);
...@@ -3658,10 +3660,10 @@ class GRANT_COLUMN :public Sql_alloc ...@@ -3658,10 +3660,10 @@ class GRANT_COLUMN :public Sql_alloc
uint key_length; uint key_length;
GRANT_COLUMN(String &c, ulong y) :rights (y), init_rights(y) GRANT_COLUMN(String &c, ulong y) :rights (y), init_rights(y)
{ {
column= (char*) memdup_root(&memex,c.ptr(), key_length=c.length()); column= (char*) memdup_root(&grant_memroot,c.ptr(), key_length=c.length());
} }
/* this constructor assumes thas source->column is allocated in memex */ /* this constructor assumes thas source->column is allocated in grant_memroot */
GRANT_COLUMN(GRANT_COLUMN *source) : column(source->column), GRANT_COLUMN(GRANT_COLUMN *source) : column(source->column),
rights (source->rights), init_rights(0), key_length(source->key_length) { } rights (source->rights), init_rights(0), key_length(source->key_length) { }
}; };
...@@ -3719,23 +3721,23 @@ void GRANT_NAME::set_user_details(const char *h, const char *d, ...@@ -3719,23 +3721,23 @@ void GRANT_NAME::set_user_details(const char *h, const char *d,
bool is_routine) bool is_routine)
{ {
/* Host given by user */ /* Host given by user */
update_hostname(&host, strdup_root(&memex, h)); update_hostname(&host, strdup_root(&grant_memroot, h));
if (db != d) if (db != d)
{ {
db= strdup_root(&memex, d); db= strdup_root(&grant_memroot, d);
if (lower_case_table_names) if (lower_case_table_names)
my_casedn_str(files_charset_info, db); my_casedn_str(files_charset_info, db);
} }
user = strdup_root(&memex,u); user = strdup_root(&grant_memroot,u);
sort= get_sort(3,host.hostname,db,user); sort= get_sort(3,host.hostname,db,user);
if (tname != t) if (tname != t)
{ {
tname= strdup_root(&memex, t); tname= strdup_root(&grant_memroot, t);
if (lower_case_table_names || is_routine) if (lower_case_table_names || is_routine)
my_casedn_str(files_charset_info, tname); my_casedn_str(files_charset_info, tname);
} }
key_length= strlen(d) + strlen(u)+ strlen(t)+3; key_length= strlen(d) + strlen(u)+ strlen(t)+3;
hash_key= (char*) alloc_root(&memex,key_length); hash_key= (char*) alloc_root(&grant_memroot,key_length);
strmov(strmov(strmov(hash_key,user)+1,db)+1,tname); strmov(strmov(strmov(hash_key,user)+1,db)+1,tname);
} }
...@@ -3759,18 +3761,18 @@ GRANT_TABLE::GRANT_TABLE(const char *h, const char *d,const char *u, ...@@ -3759,18 +3761,18 @@ GRANT_TABLE::GRANT_TABLE(const char *h, const char *d,const char *u,
*/ */
GRANT_NAME::GRANT_NAME(TABLE *form, bool is_routine) GRANT_NAME::GRANT_NAME(TABLE *form, bool is_routine)
{ {
user= safe_str(get_field(&memex,form->field[2])); user= safe_str(get_field(&grant_memroot,form->field[2]));
const char *hostname= get_field(&memex, form->field[0]); const char *hostname= get_field(&grant_memroot, form->field[0]);
mysql_mutex_lock(&acl_cache->lock); mysql_mutex_lock(&acl_cache->lock);
if (!hostname && find_acl_role(user)) if (!hostname && find_acl_role(user))
hostname= ""; hostname= "";
mysql_mutex_unlock(&acl_cache->lock); mysql_mutex_unlock(&acl_cache->lock);
update_hostname(&host, hostname); update_hostname(&host, hostname);
db= get_field(&memex,form->field[1]); db= get_field(&grant_memroot,form->field[1]);
sort= get_sort(3, host.hostname, db, user); sort= get_sort(3, host.hostname, db, user);
tname= get_field(&memex,form->field[3]); tname= get_field(&grant_memroot,form->field[3]);
if (!db || !tname) if (!db || !tname)
{ {
/* Wrong table row; Ignore it */ /* Wrong table row; Ignore it */
...@@ -3786,7 +3788,7 @@ GRANT_NAME::GRANT_NAME(TABLE *form, bool is_routine) ...@@ -3786,7 +3788,7 @@ GRANT_NAME::GRANT_NAME(TABLE *form, bool is_routine)
my_casedn_str(files_charset_info, tname); my_casedn_str(files_charset_info, tname);
} }
key_length= (strlen(db) + strlen(user) + strlen(tname) + 3); key_length= (strlen(db) + strlen(user) + strlen(tname) + 3);
hash_key= (char*) alloc_root(&memex, key_length); hash_key= (char*) alloc_root(&grant_memroot, key_length);
strmov(strmov(strmov(hash_key,user)+1,db)+1,tname); strmov(strmov(strmov(hash_key,user)+1,db)+1,tname);
privs = (ulong) form->field[6]->val_int(); privs = (ulong) form->field[6]->val_int();
privs = fix_rights_for_table(privs); privs = fix_rights_for_table(privs);
...@@ -4992,7 +4994,7 @@ static int update_role_columns(GRANT_TABLE *merged, ...@@ -4992,7 +4994,7 @@ static int update_role_columns(GRANT_TABLE *merged,
else else
{ {
changed= 1; changed= 1;
my_hash_insert(mh, (uchar*)new (&memex) GRANT_COLUMN(ccol)); my_hash_insert(mh, (uchar*)new (&grant_memroot) GRANT_COLUMN(ccol));
} }
} }
} }
...@@ -5043,7 +5045,7 @@ static int update_role_table_columns(GRANT_TABLE *merged, ...@@ -5043,7 +5045,7 @@ static int update_role_table_columns(GRANT_TABLE *merged,
roles) we need to create it roles) we need to create it
*/ */
DBUG_ASSERT(privs | cols); DBUG_ASSERT(privs | cols);
merged= new (&memex) GRANT_TABLE("", first[0]->db, role, first[0]->tname, merged= new (&grant_memroot) GRANT_TABLE("", first[0]->db, role, first[0]->tname,
privs, cols); privs, cols);
merged->init_privs= merged->init_cols= 0; merged->init_privs= merged->init_cols= 0;
update_role_columns(merged, first, last); update_role_columns(merged, first, last);
...@@ -5169,7 +5171,7 @@ static int update_role_routines(GRANT_NAME *merged, GRANT_NAME **first, ...@@ -5169,7 +5171,7 @@ static int update_role_routines(GRANT_NAME *merged, GRANT_NAME **first,
roles) we need to create it roles) we need to create it
*/ */
DBUG_ASSERT(privs); DBUG_ASSERT(privs);
merged= new (&memex) GRANT_NAME("", first[0]->db, role, first[0]->tname, merged= new (&grant_memroot) GRANT_NAME("", first[0]->db, role, first[0]->tname,
privs, true); privs, true);
merged->init_privs= 0; // all privs are inherited merged->init_privs= 0; // all privs are inherited
my_hash_insert(hash, (uchar *)merged); my_hash_insert(hash, (uchar *)merged);
...@@ -5491,7 +5493,7 @@ int mysql_table_grant(THD *thd, TABLE_LIST *table_list, ...@@ -5491,7 +5493,7 @@ int mysql_table_grant(THD *thd, TABLE_LIST *table_list,
mysql_rwlock_wrlock(&LOCK_grant); mysql_rwlock_wrlock(&LOCK_grant);
mysql_mutex_lock(&acl_cache->lock); mysql_mutex_lock(&acl_cache->lock);
MEM_ROOT *old_root= thd->mem_root; MEM_ROOT *old_root= thd->mem_root;
thd->mem_root= &memex; thd->mem_root= &grant_memroot;
grant_version++; grant_version++;
while ((tmp_Str = str_list++)) while ((tmp_Str = str_list++))
...@@ -5701,7 +5703,7 @@ bool mysql_routine_grant(THD *thd, TABLE_LIST *table_list, bool is_proc, ...@@ -5701,7 +5703,7 @@ bool mysql_routine_grant(THD *thd, TABLE_LIST *table_list, bool is_proc,
mysql_rwlock_wrlock(&LOCK_grant); mysql_rwlock_wrlock(&LOCK_grant);
mysql_mutex_lock(&acl_cache->lock); mysql_mutex_lock(&acl_cache->lock);
MEM_ROOT *old_root= thd->mem_root; MEM_ROOT *old_root= thd->mem_root;
thd->mem_root= &memex; thd->mem_root= &grant_memroot;
DBUG_PRINT("info",("now time to iterate and add users")); DBUG_PRINT("info",("now time to iterate and add users"));
...@@ -6206,7 +6208,7 @@ void grant_free(void) ...@@ -6206,7 +6208,7 @@ void grant_free(void)
my_hash_free(&column_priv_hash); my_hash_free(&column_priv_hash);
my_hash_free(&proc_priv_hash); my_hash_free(&proc_priv_hash);
my_hash_free(&func_priv_hash); my_hash_free(&func_priv_hash);
free_root(&memex,MYF(0)); free_root(&grant_memroot,MYF(0));
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
} }
...@@ -6273,7 +6275,7 @@ static my_bool grant_load(THD *thd, TABLE_LIST *tables) ...@@ -6273,7 +6275,7 @@ static my_bool grant_load(THD *thd, TABLE_LIST *tables)
0,0,0, (my_hash_get_key) get_grant_table, 0,0); 0,0,0, (my_hash_get_key) get_grant_table, 0,0);
(void) my_hash_init(&func_priv_hash, &my_charset_utf8_bin, (void) my_hash_init(&func_priv_hash, &my_charset_utf8_bin,
0,0,0, (my_hash_get_key) get_grant_table, 0,0); 0,0,0, (my_hash_get_key) get_grant_table, 0,0);
init_sql_alloc(&memex, ACL_ALLOC_BLOCK_SIZE, 0, MYF(0)); init_sql_alloc(&grant_memroot, ACL_ALLOC_BLOCK_SIZE, 0, MYF(0));
t_table= tables[0].table; t_table= tables[0].table;
c_table= tables[1].table; c_table= tables[1].table;
...@@ -6285,7 +6287,7 @@ static my_bool grant_load(THD *thd, TABLE_LIST *tables) ...@@ -6285,7 +6287,7 @@ static my_bool grant_load(THD *thd, TABLE_LIST *tables)
t_table->use_all_columns(); t_table->use_all_columns();
c_table->use_all_columns(); c_table->use_all_columns();
memex_ptr= &memex; memex_ptr= &grant_memroot;
my_pthread_setspecific_ptr(THR_MALLOC, &memex_ptr); my_pthread_setspecific_ptr(THR_MALLOC, &memex_ptr);
if (!t_table->file->ha_index_first(t_table->record[0])) if (!t_table->file->ha_index_first(t_table->record[0]))
...@@ -6469,7 +6471,7 @@ my_bool grant_reload(THD *thd) ...@@ -6469,7 +6471,7 @@ my_bool grant_reload(THD *thd)
Create a new memory pool but save the current memory pool to make an undo Create a new memory pool but save the current memory pool to make an undo
opertion possible in case of failure. opertion possible in case of failure.
*/ */
old_mem= memex; old_mem= grant_memroot;
if ((return_val= grant_load(thd, tables))) if ((return_val= grant_load(thd, tables)))
{ // Error. Revert to old hash { // Error. Revert to old hash
...@@ -6478,7 +6480,7 @@ my_bool grant_reload(THD *thd) ...@@ -6478,7 +6480,7 @@ my_bool grant_reload(THD *thd)
column_priv_hash= old_column_priv_hash; /* purecov: deadcode */ column_priv_hash= old_column_priv_hash; /* purecov: deadcode */
proc_priv_hash= old_proc_priv_hash; proc_priv_hash= old_proc_priv_hash;
func_priv_hash= old_func_priv_hash; func_priv_hash= old_func_priv_hash;
memex= old_mem; /* purecov: deadcode */ grant_memroot= old_mem; /* purecov: deadcode */
} }
else else
{ {
...@@ -8607,7 +8609,7 @@ static int handle_grant_struct(enum enum_acl_lists struct_no, bool drop, ...@@ -8607,7 +8609,7 @@ static int handle_grant_struct(enum enum_acl_lists struct_no, bool drop,
my_hash_delete(&acl_roles, (uchar*) acl_role); my_hash_delete(&acl_roles, (uchar*) acl_role);
DBUG_RETURN(1); DBUG_RETURN(1);
} }
acl_role->user.str= strdup_root(&mem, user_to->user.str); acl_role->user.str= strdup_root(&acl_memroot, user_to->user.str);
acl_role->user.length= user_to->user.length; acl_role->user.length= user_to->user.length;
my_hash_update(&acl_roles, (uchar*) acl_role, (uchar*) old_key, my_hash_update(&acl_roles, (uchar*) acl_role, (uchar*) old_key,
...@@ -8768,14 +8770,14 @@ static int handle_grant_struct(enum enum_acl_lists struct_no, bool drop, ...@@ -8768,14 +8770,14 @@ static int handle_grant_struct(enum enum_acl_lists struct_no, bool drop,
{ {
switch ( struct_no ) { switch ( struct_no ) {
case USER_ACL: case USER_ACL:
acl_user->user.str= strdup_root(&mem, user_to->user.str); acl_user->user.str= strdup_root(&acl_memroot, user_to->user.str);
acl_user->user.length= user_to->user.length; acl_user->user.length= user_to->user.length;
acl_user->host.hostname= strdup_root(&mem, user_to->host.str); acl_user->host.hostname= strdup_root(&acl_memroot, user_to->host.str);
break; break;
case DB_ACL: case DB_ACL:
acl_db->user= strdup_root(&mem, user_to->user.str); acl_db->user= strdup_root(&acl_memroot, user_to->user.str);
acl_db->host.hostname= strdup_root(&mem, user_to->host.str); acl_db->host.hostname= strdup_root(&acl_memroot, user_to->host.str);
break; break;
case COLUMN_PRIVILEGES_HASH: case COLUMN_PRIVILEGES_HASH:
...@@ -8817,8 +8819,8 @@ static int handle_grant_struct(enum enum_acl_lists struct_no, bool drop, ...@@ -8817,8 +8819,8 @@ static int handle_grant_struct(enum enum_acl_lists struct_no, bool drop,
} }
case PROXY_USERS_ACL: case PROXY_USERS_ACL:
acl_proxy_user->set_user (&mem, user_to->user.str); acl_proxy_user->set_user (&acl_memroot, user_to->user.str);
acl_proxy_user->set_host (&mem, user_to->host.str); acl_proxy_user->set_host (&acl_memroot, user_to->host.str);
break; break;
case ROLES_MAPPINGS_HASH: case ROLES_MAPPINGS_HASH:
...@@ -8832,11 +8834,11 @@ static int handle_grant_struct(enum enum_acl_lists struct_no, bool drop, ...@@ -8832,11 +8834,11 @@ static int handle_grant_struct(enum enum_acl_lists struct_no, bool drop,
bool oom; bool oom;
if (role_not_matched) if (role_not_matched)
oom= role_grant_pair->init(&mem, user_to->user.str, oom= role_grant_pair->init(&acl_memroot, user_to->user.str,
user_to->host.str, user_to->host.str,
role_grant_pair->r_uname, false); role_grant_pair->r_uname, false);
else else
oom= role_grant_pair->init(&mem, role_grant_pair->u_uname, oom= role_grant_pair->init(&acl_memroot, role_grant_pair->u_uname,
role_grant_pair->u_hname, role_grant_pair->u_hname,
user_to->user.str, false); user_to->user.str, false);
if (oom) if (oom)
......
sql/sql_class.cc
View file @ 517b1f4f
...@@ -73,8 +73,6 @@ ...@@ -73,8 +73,6 @@
char internal_table_name[2]= "*"; char internal_table_name[2]= "*";
char empty_c_string[1]= {0}; /* used for not defined db */ char empty_c_string[1]= {0}; /* used for not defined db */
LEX_STRING EMPTY_STR= { (char *) "", 0 };
const char * const THD::DEFAULT_WHERE= "field list"; const char * const THD::DEFAULT_WHERE= "field list";
/**************************************************************************** /****************************************************************************
......
sql/sql_yacc.yy
View file @ 517b1f4f
...@@ -276,7 +276,7 @@ void case_stmt_action_case(LEX *lex) ...@@ -276,7 +276,7 @@ void case_stmt_action_case(LEX *lex)
(Instruction 12 in the example) (Instruction 12 in the example)
*/ */
lex->spcont->push_label(current_thd, EMPTY_STR, lex->sphead->instructions()); lex->spcont->push_label(current_thd, empty_lex_str, lex->sphead->instructions());
} }
/** /**
...@@ -345,7 +345,7 @@ int case_stmt_action_when(LEX *lex, Item *when, bool simple) ...@@ -345,7 +345,7 @@ int case_stmt_action_when(LEX *lex, Item *when, bool simple)
*/ */
return !test(i) || return !test(i) ||
sp->push_backpatch(i, ctx->push_label(current_thd, EMPTY_STR, 0)) || sp->push_backpatch(i, ctx->push_label(current_thd, empty_lex_str, 0)) ||
sp->add_cont_backpatch(i) || sp->add_cont_backpatch(i) ||
sp->add_instr(i); sp->add_instr(i);
} }
...@@ -3074,7 +3074,7 @@ sp_decl: ...@@ -3074,7 +3074,7 @@ sp_decl:
sp->push_backpatch(i, ctx->last_label())) sp->push_backpatch(i, ctx->last_label()))
MYSQL_YYABORT; MYSQL_YYABORT;
if (sp->push_backpatch(i, ctx->push_label(thd, EMPTY_STR, 0))) if (sp->push_backpatch(i, ctx->push_label(thd, empty_lex_str, 0)))
MYSQL_YYABORT; MYSQL_YYABORT;
} }
sp_hcond_list sp_proc_stmt sp_hcond_list sp_proc_stmt
...@@ -3719,8 +3719,7 @@ sp_proc_stmt_unlabeled: ...@@ -3719,8 +3719,7 @@ sp_proc_stmt_unlabeled:
{ /* Unlabeled controls get a secret label. */ { /* Unlabeled controls get a secret label. */
LEX *lex= Lex; LEX *lex= Lex;
lex->spcont->push_label(thd, lex->spcont->push_label(thd, empty_lex_str,
EMPTY_STR,
lex->sphead->instructions()); lex->sphead->instructions());
} }
sp_unlabeled_control sp_unlabeled_control
...@@ -3949,7 +3948,7 @@ sp_if: ...@@ -3949,7 +3948,7 @@ sp_if:
sp_instr_jump_if_not *i = new sp_instr_jump_if_not(ip, ctx, sp_instr_jump_if_not *i = new sp_instr_jump_if_not(ip, ctx,
$2, lex); $2, lex);
if (i == NULL || if (i == NULL ||
sp->push_backpatch(i, ctx->push_label(thd, EMPTY_STR, 0)) || sp->push_backpatch(i, ctx->push_label(thd, empty_lex_str, 0)) ||
sp->add_cont_backpatch(i) || sp->add_cont_backpatch(i) ||
sp->add_instr(i)) sp->add_instr(i))
MYSQL_YYABORT; MYSQL_YYABORT;
...@@ -3966,7 +3965,7 @@ sp_if: ...@@ -3966,7 +3965,7 @@ sp_if:
sp->add_instr(i)) sp->add_instr(i))
MYSQL_YYABORT; MYSQL_YYABORT;
sp->backpatch(ctx->pop_label()); sp->backpatch(ctx->pop_label());
sp->push_backpatch(i, ctx->push_label(thd, EMPTY_STR, 0)); sp->push_backpatch(i, ctx->push_label(thd, empty_lex_str, 0));
} }
sp_elseifs sp_elseifs
{ {
...@@ -4179,7 +4178,7 @@ sp_unlabeled_block: ...@@ -4179,7 +4178,7 @@ sp_unlabeled_block:
{ /* Unlabeled blocks get a secret label. */ { /* Unlabeled blocks get a secret label. */
LEX *lex= Lex; LEX *lex= Lex;
uint ip= lex->sphead->instructions(); uint ip= lex->sphead->instructions();
sp_label *lab= lex->spcont->push_label(thd, EMPTY_STR, ip); sp_label *lab= lex->spcont->push_label(thd, empty_lex_str, ip);
lab->type= sp_label::BEGIN; lab->type= sp_label::BEGIN;
} }
sp_block_content sp_block_content
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7