diff options
| author | mkindahl@dl145k.mysql.com <> | 2006-07-11 12:17:19 +0200 |
|---|---|---|
| committer | mkindahl@dl145k.mysql.com <> | 2006-07-11 12:17:19 +0200 |
| commit | 9415b241395aca49afb44b8a34ca4daaa7aecb65 (patch) | |
| tree | a7de1f862d3573e58eb4ee35c13d673028cafbf0 /sql/sp_head.cc | |
| parent | 512d1c7ff3513a1712997394cc5b75108e840fd3 (diff) | |
| parent | 0581033b3b159e93b29e93a655708d4112ca7665 (diff) | |
| download | mariadb-git-9415b241395aca49afb44b8a34ca4daaa7aecb65.tar.gz | |
Merge dl145k.mysql.com:/data0/mkindahl/bkroot/mysql-5.1-new-rpl
into dl145k.mysql.com:/data0/mkindahl/bk/MERGE/mysql-5.1-merge
Diffstat (limited to 'sql/sp_head.cc')
| -rw-r--r-- | sql/sp_head.cc | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/sql/sp_head.cc b/sql/sp_head.cc index 81f5d502ec9..029c6fa22a9 100644 --- a/sql/sp_head.cc +++ b/sql/sp_head.cc @@ -1661,6 +1661,16 @@ sp_head::restore_lex(THD *thd) oldlex->next_state= sublex->next_state; oldlex->trg_table_fields.push_back(&sublex->trg_table_fields); +#ifdef HAVE_ROW_BASED_REPLICATION + /* + If this substatement needs row-based, the entire routine does too (we + cannot switch from statement-based to row-based only for this + substatement). + */ + if (sublex->binlog_row_based_if_mixed) + m_flags|= BINLOG_ROW_BASED_IF_MIXED; +#endif + /* Add routines which are used by statement to respective set for this routine. |