diff options
| author | Jan Lindström <jplindst@mariadb.org> | 2013-09-03 17:50:36 +0300 |
|---|---|---|
| committer | Jan Lindström <jplindst@mariadb.org> | 2013-09-03 17:50:36 +0300 |
| commit | ba3ff50ab2bfabab6a4307282f92854f6efe6382 (patch) | |
| tree | 904c9b94cc5f1dfa8727f17af56f50fba4155205 /sql/sql_reload.cc | |
| parent | 81739d308fee0317e56bd70d97e3429ece83dd4b (diff) | |
| parent | c8b87ca16f05826c6801c70fb20a88a61959264e (diff) | |
| download | mariadb-git-ba3ff50ab2bfabab6a4307282f92854f6efe6382.tar.gz | |
Merge 10.0 to galera-10.0
Diffstat (limited to 'sql/sql_reload.cc')
| -rw-r--r-- | sql/sql_reload.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_reload.cc b/sql/sql_reload.cc index 27156e2236a..3bb2164866f 100644 --- a/sql/sql_reload.cc +++ b/sql/sql_reload.cc @@ -53,7 +53,7 @@ static void disable_checkpoints(THD *thd); @retval !=0 Error; thd->killed is set or thd->is_error() is true */ -bool reload_acl_and_cache(THD *thd, unsigned long options, +bool reload_acl_and_cache(THD *thd, unsigned long long options, TABLE_LIST *tables, int *write_to_binlog) { bool result=0; @@ -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; } @@ -360,7 +360,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; } |