From 293268c6c29dbbf0c6c21b5d6990a3c1f6fa3c3c Mon Sep 17 00:00:00 2001
From: Konstantin Osipov <kostja@sun.com>
Date: Fri, 5 Feb 2010 13:25:32 +0300
Subject: [PATCH] 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.

---
 sql/sql_acl.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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