1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge adventure.(none):/home/thek/Development/cpp/bug24988/my50-bug24988

Browse Source 
into  adventure.(none):/home/thek/Development/cpp/bug24988/my51-bug24988


sql/mysqld.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
This commit is contained in:
unknown 2007-05-28 13:56:49 +02:00
commit 2c06c07a7a
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sql/mysqld.cc
View File

@ -347,7 +347,15 @@ bool opt_endinfo, using_udf_functions;
my_bool locked_in_memory; my_bool locked_in_memory;
bool opt_using_transactions, using_update_log; bool opt_using_transactions, using_update_log;
bool volatile abort_loop; bool volatile abort_loop;
bool volatile shutdown_in_progress, grant_option; bool volatile shutdown_in_progress;
/**
@brief 'grant_option' is used to indicate if privileges needs
to be checked, in which case the lock, LOCK_grant, is used
to protect access to the grant table.
@note This flag is dropped in 5.1
@see grant_init()
*/
bool volatile grant_option;
my_bool opt_skip_slave_start = 0; // If set, slave is not autostarted my_bool opt_skip_slave_start = 0; // If set, slave is not autostarted
my_bool opt_reckless_slave = 0; my_bool opt_reckless_slave = 0;

11
sql/sql_acl.cc
View File

@ -3136,7 +3136,7 @@ bool mysql_table_grant(THD *thd, TABLE_LIST *table_list,
} }
} }
} }
grant_option=TRUE;
thd->mem_root= old_root; thd->mem_root= old_root;
pthread_mutex_unlock(&acl_cache->lock); pthread_mutex_unlock(&acl_cache->lock);
@ -3310,7 +3310,7 @@ bool mysql_routine_grant(THD *thd, TABLE_LIST *table_list, bool is_proc,
continue; continue;
} }
} }
grant_option=TRUE;
thd->mem_root= old_root; thd->mem_root= old_root;
pthread_mutex_unlock(&acl_cache->lock); pthread_mutex_unlock(&acl_cache->lock);
if (!result && !no_error) if (!result && !no_error)
@ -3493,6 +3493,8 @@ my_bool grant_init()
delete thd; delete thd;
/* Remember that we don't have a THD */ /* Remember that we don't have a THD */
my_pthread_setspecific_ptr(THR_THD, 0); my_pthread_setspecific_ptr(THR_THD, 0);
/* Set the grant option flag so we will check grants */
grant_option= TRUE;
DBUG_RETURN(return_val); DBUG_RETURN(return_val);
} }
@ -3522,7 +3524,6 @@ static my_bool grant_load(TABLE_LIST *tables)
THR_MALLOC); THR_MALLOC);
DBUG_ENTER("grant_load"); DBUG_ENTER("grant_load");
grant_option = FALSE;
(void) hash_init(&column_priv_hash,system_charset_info, (void) hash_init(&column_priv_hash,system_charset_info,
0,0,0, (hash_get_key) get_grant_table, 0,0,0, (hash_get_key) get_grant_table,
(hash_free_key) free_grant_table,0); (hash_free_key) free_grant_table,0);
@ -3637,7 +3638,6 @@ static my_bool grant_load(TABLE_LIST *tables)
} }
while (!p_table->file->index_next(p_table->record[0])); while (!p_table->file->index_next(p_table->record[0]));
} }
grant_option= TRUE;
return_val=0; // Return ok return_val=0; // Return ok
end_unlock: end_unlock:
@ -3670,7 +3670,6 @@ my_bool grant_reload(THD *thd)
{ {
TABLE_LIST tables[3]; TABLE_LIST tables[3];
HASH old_column_priv_hash, old_proc_priv_hash, old_func_priv_hash; HASH old_column_priv_hash, old_proc_priv_hash, old_func_priv_hash;
bool old_grant_option;
MEM_ROOT old_mem; MEM_ROOT old_mem;
my_bool return_val= 1; my_bool return_val= 1;
DBUG_ENTER("grant_reload"); DBUG_ENTER("grant_reload");
@ -3700,7 +3699,6 @@ my_bool grant_reload(THD *thd)
old_column_priv_hash= column_priv_hash; old_column_priv_hash= column_priv_hash;
old_proc_priv_hash= proc_priv_hash; old_proc_priv_hash= proc_priv_hash;
old_func_priv_hash= func_priv_hash; old_func_priv_hash= func_priv_hash;
old_grant_option= grant_option;
old_mem= memex; old_mem= memex;
if ((return_val= grant_load(tables))) if ((return_val= grant_load(tables)))
@ -3710,7 +3708,6 @@ 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;
grant_option= old_grant_option; /* purecov: deadcode */
memex= old_mem; /* purecov: deadcode */ memex= old_mem; /* purecov: deadcode */
} }
else else