mirror of
https://github.com/MariaDB/server.git
synced 2025-08-07 00:04:31 +03:00
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.
This commit is contained in:
@@ -3419,7 +3419,7 @@ bool mysql_routine_grant(THD *thd, TABLE_LIST *table_list, bool is_proc,
|
|||||||
|
|
||||||
if (write_to_binlog)
|
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;
|
result= TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user