diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-12-16 21:02:21 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-12-16 21:02:21 +0300 |
| commit | 5f0c09dd7220b7ad5709823788e9289fc94ab8fe (patch) | |
| tree | c656767fe54a976ffb669926348b9fac198be312 /sql/sql_acl.cc | |
| parent | 5194074be762f169fcc25b9ad0d4013905ba0655 (diff) | |
| parent | f1e83a4163458f7e25c709403cc7c7b48a7ef23e (diff) | |
| download | mariadb-git-5f0c09dd7220b7ad5709823788e9289fc94ab8fe.tar.gz | |
Manual merge from mysql-trunk-merge.
Conflicts:
- include/my_no_pthread.h
- mysql-test/r/sp-ucs2.result
- sql/log.cc
- sql/sql_acl.cc
- sql/sql_yacc.yy
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 b91dc9a7e25..05e8cee9151 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -3440,7 +3440,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; } |