database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Applied all changes from Igor and Sanja

Browse Source
This commit is contained in:
Michael Widenius
2013-06-15 18:32:08 +03:00
parent 3143ad589a
commit 5f1f2fc0e4
162 changed files with 11704 additions and 6298 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_reload.cc
View File

@ -176,7 +176,7 @@ bool reload_acl_and_cache(THD *thd, unsigned long options,
mysql_mutex_lock(&LOCK_active_mi);
if (!(mi= (master_info_index->
get_master_info(&connection_name,
MYSQL_ERROR::WARN_LEVEL_ERROR))))
Sql_condition::WARN_LEVEL_ERROR))))
{
result= 1;
}
@ -348,7 +348,7 @@ bool reload_acl_and_cache(THD *thd, unsigned long options,
if (!(mi= (master_info_index->
get_master_info(&lex_mi->connection_name,
MYSQL_ERROR::WARN_LEVEL_ERROR))))
Sql_condition::WARN_LEVEL_ERROR))))
{
result= 1;
}