diff options
| author | Konstantin Osipov <kostja@sun.com> | 2010-02-05 13:25:32 +0300 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2010-02-05 13:25:32 +0300 |
| commit | 74542833875dfe240dc63bfd92b9418556d19a0e (patch) | |
| tree | 5868dc5ac8fad5f5277abc535adad4bbe412bab2 /sql/sql_acl.cc | |
| parent | a6f804228dfb17d1b3876555eb6209cb9d33becd (diff) | |
| download | mariadb-git-74542833875dfe240dc63bfd92b9418556d19a0e.tar.gz | |
next-mr -> next-4284 merge:
fix a merge bug when write_bin_log called from mysql_routine_grant()
would chew up the error.
rpl_do_grant test would fail on assert that the diagnostics area is
empty.
Diffstat (limited to 'sql/sql_acl.cc')
| -rw-r--r-- | sql/sql_acl.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index 0ec8671abaf..cf379417149 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -3419,7 +3419,7 @@ bool mysql_routine_grant(THD *thd, TABLE_LIST *table_list, bool is_proc, if (write_to_binlog) { - if (write_bin_log(thd, TRUE, thd->query(), thd->query_length())) + if (write_bin_log(thd, FALSE, thd->query(), thd->query_length())) result= TRUE; } |