1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

next-mr -> next-4284 merge:

Browse Source 
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:
Konstantin Osipov 2010-02-05 13:25:32 +03:00
parent 5deaf55a1c
commit 293268c6c2
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_acl.cc
View File

@ -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;
}