diff options
| author | Guilhem Bichot <guilhem.bichot@oracle.com> | 2011-05-21 10:21:08 +0200 |
|---|---|---|
| committer | Guilhem Bichot <guilhem.bichot@oracle.com> | 2011-05-21 10:21:08 +0200 |
| commit | 3ceec2f19cff22d7b6078b6a8d5788fa19264b8a (patch) | |
| tree | 43fd6afdae9f8879ad4cdbb000497fee7cba02f4 /sql/sql_reload.cc | |
| parent | 955cb796e7672d1186f44de84528b7b8fe47f0c9 (diff) | |
| parent | 12c42b980aa94105a9108d4f58c5dc75d96ec824 (diff) | |
| download | mariadb-git-3ceec2f19cff22d7b6078b6a8d5788fa19264b8a.tar.gz | |
Merge from 5.1.
Diffstat (limited to 'sql/sql_reload.cc')
| -rw-r--r-- | sql/sql_reload.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_reload.cc b/sql/sql_reload.cc index a09aa5511bd..b567e3a1f85 100644 --- a/sql/sql_reload.cc +++ b/sql/sql_reload.cc @@ -86,7 +86,7 @@ bool reload_acl_and_cache(THD *thd, unsigned long options, 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"); + my_error(ER_UNKNOWN_ERROR, MYF(0)); } } |