diff options
| author | Kristofer Pettersson <kpettersson@mysql.com> | 2008-07-29 15:15:04 +0200 |
|---|---|---|
| committer | Kristofer Pettersson <kpettersson@mysql.com> | 2008-07-29 15:15:04 +0200 |
| commit | 0b918cfd7d786f40a540779e331804048c943bb0 (patch) | |
| tree | c8110473c2d870e1a27590f23de0b387a526c159 /sql | |
| parent | 14887bb2ab898fa18b14e233567b994c494e59d3 (diff) | |
| parent | 12db5ab0d674015930d952888fb7ff1a97a1dd83 (diff) | |
| download | mariadb-git-0b918cfd7d786f40a540779e331804048c943bb0.tar.gz | |
auto merge
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_parse.cc | 31 |
1 files changed, 24 insertions, 7 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 58b942f21d2..2fcfc80d143 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -7069,11 +7069,23 @@ bool reload_acl_and_cache(THD *thd, ulong options, TABLE_LIST *tables, thd->thread_stack= (char*) &tmp_thd; thd->store_globals(); } + if (thd) { - (void)acl_reload(thd); - (void)grant_reload(thd); + bool reload_acl_failed= acl_reload(thd); + bool reload_grants_failed= grant_reload(thd); + + if (reload_acl_failed || reload_grants_failed) + { + result= 1; + /* + When an error is returned, my_message may have not been called and + the client will hang waiting for a response. + */ + my_error(ER_UNKNOWN_ERROR, MYF(0), "FLUSH PRIVILEGES failed"); + } } + if (tmp_thd) { delete tmp_thd; @@ -7159,8 +7171,10 @@ bool reload_acl_and_cache(THD *thd, ulong options, TABLE_LIST *tables, tmp_write_to_binlog= 0; if (lock_global_read_lock(thd)) return 1; // Killed - result=close_cached_tables(thd,(options & REFRESH_FAST) ? 0 : 1, - tables); + if (close_cached_tables(thd,(options & REFRESH_FAST) ? 0 : 1, + tables)) + result= 1; + if (make_global_read_lock_block_commit(thd)) // Killed { /* Don't leave things in a half-locked state */ @@ -7169,7 +7183,10 @@ bool reload_acl_and_cache(THD *thd, ulong options, TABLE_LIST *tables, } } else - result=close_cached_tables(thd,(options & REFRESH_FAST) ? 0 : 1, tables); + { + if (close_cached_tables(thd,(options & REFRESH_FAST) ? 0 : 1, tables)) + result= 1; + } my_dbopt_cleanup(); } if (options & REFRESH_HOSTS) @@ -7193,8 +7210,8 @@ bool reload_acl_and_cache(THD *thd, ulong options, TABLE_LIST *tables, #ifdef OPENSSL if (options & REFRESH_DES_KEY_FILE) { - if (des_key_file) - result=load_des_key_file(des_key_file); + if (des_key_file && load_des_key_file(des_key_file)) + result= 1; } #endif #ifdef HAVE_REPLICATION |