summaryrefslogtreecommitdiff
path: root/sql/sql_reload.cc
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2013-06-15 18:32:08 +0300
committerMichael Widenius <monty@askmonty.org>2013-06-15 18:32:08 +0300
commit5f1f2fc0e443f098af24d21f7d1ec1a8166a4030 (patch)
tree7b870d0c390c05d6629f4813966e740ea073fcef /sql/sql_reload.cc
parent3143ad589a24ac7581e2195ba0dc13576cb3c9da (diff)
downloadmariadb-git-5f1f2fc0e443f098af24d21f7d1ec1a8166a4030.tar.gz
Applied all changes from Igor and Sanja
Diffstat (limited to 'sql/sql_reload.cc')
-rw-r--r--sql/sql_reload.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_reload.cc b/sql/sql_reload.cc
index 2720dc7cd74..052e303798c 100644
--- a/sql/sql_reload.cc
+++ b/sql/sql_reload.cc
@@ -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;
}