summaryrefslogtreecommitdiff
path: root/sql/sql_acl.cc
diff options
context:
space:
mode:
authorAlexey Kopytov <Alexey.Kopytov@Sun.com>2009-12-11 19:40:58 +0300
committerAlexey Kopytov <Alexey.Kopytov@Sun.com>2009-12-11 19:40:58 +0300
commitebdef570e552b93b693398f42c229cf77ab85965 (patch)
treead3ff84791c35c7d8b2d47a60f0ea4cb409a0a31 /sql/sql_acl.cc
parent567671368723c704d60902b4d0ccff951b414552 (diff)
parent684c7aba09583e54c5272cc3b0eec207afc87a39 (diff)
downloadmariadb-git-ebdef570e552b93b693398f42c229cf77ab85965.tar.gz
Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.
Diffstat (limited to 'sql/sql_acl.cc')
-rw-r--r--sql/sql_acl.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc
index 8eb429e9ffc..4c24ef1dedd 100644
--- a/sql/sql_acl.cc
+++ b/sql/sql_acl.cc
@@ -3381,7 +3381,7 @@ bool mysql_routine_grant(THD *thd, TABLE_LIST *table_list, bool is_proc,
if (write_to_binlog)
{
- write_bin_log(thd, TRUE, thd->query(), thd->query_length());
+ write_bin_log(thd, FALSE, thd->query(), thd->query_length());
}
rw_unlock(&LOCK_grant);