diff options
| author | unknown <guilhem@mysql.com> | 2006-02-25 22:22:12 +0100 |
|---|---|---|
| committer | unknown <guilhem@mysql.com> | 2006-02-25 22:22:12 +0100 |
| commit | 9cd6325b63975391e9016cd89125e01642af7c42 (patch) | |
| tree | 82c0cff48d5ce0d0c10d4fd0e6dd73f513bf8cba /sql/sp_head.cc | |
| parent | 8f4cec206ba6ec44f1e1e84f4b0842f585039ace (diff) | |
| parent | 7cac0ddfd01a6cdb4a8779fe1fb2edf10c1dc751 (diff) | |
| download | mariadb-git-9cd6325b63975391e9016cd89125e01642af7c42.tar.gz | |
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/home/mysql_src/mysql-5.1-new
sql/mysqld.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/share/errmsg.txt:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
Diffstat (limited to 'sql/sp_head.cc')
| -rw-r--r-- | sql/sp_head.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sp_head.cc b/sql/sp_head.cc index c4b09baf75a..fcc0dc3772e 100644 --- a/sql/sp_head.cc +++ b/sql/sp_head.cc @@ -1301,7 +1301,7 @@ sp_head::execute_function(THD *thd, Item **argp, uint argcount, each substatement be binlogged its way. */ need_binlog_call= mysql_bin_log.is_open() && - (thd->options & OPTION_BIN_LOG) && !binlog_row_based; + (thd->options & OPTION_BIN_LOG) && !thd->current_stmt_binlog_row_based; if (need_binlog_call) { reset_dynamic(&thd->user_var_events); |