diff options
| author | Alfranio Correia <alfranio.correia@sun.com> | 2010-06-01 20:49:58 +0100 |
|---|---|---|
| committer | Alfranio Correia <alfranio.correia@sun.com> | 2010-06-01 20:49:58 +0100 |
| commit | f11b030e1728744d345dca708819eaee09f43a7c (patch) | |
| tree | ee51b952edd79fb74915ae3e49bee973f701a2a5 /sql/sql_parse.cc | |
| parent | 46bc8970c9b0afa3351cfacd58ce279b01c894dd (diff) | |
| parent | 29c7acd6d41c5a7515b3757f87aedfe08accfe46 (diff) | |
| download | mariadb-git-f11b030e1728744d345dca708819eaee09f43a7c.tar.gz | |
auto-merge mysql-trunk-bugfixing (local) --> mysql-trunk-bugfixing
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index ed4390a23cb..90d0a52d40d 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -2670,6 +2670,10 @@ case SQLCOM_PREPARE: */ lex->unlink_first_table(&link_to_local); + /* So that CREATE TEMPORARY TABLE gets to binlog at commit/rollback */ + if (create_info.options & HA_LEX_CREATE_TMP_TABLE) + thd->variables.option_bits|= OPTION_KEEP_LOG; + /* select_create is currently not re-execution friendly and needs to be created for every execution of a PS/SP. |