diff options
| author | Alfranio Correia <alfranio.correia@sun.com> | 2010-06-27 18:31:42 +0100 |
|---|---|---|
| committer | Alfranio Correia <alfranio.correia@sun.com> | 2010-06-27 18:31:42 +0100 |
| commit | 77854696c4d0cab8ff56ea68e82879e87f30083c (patch) | |
| tree | edf7935a7731d766ce435c9b2ae5e40fa7416836 /sql/sql_parse.cc | |
| parent | 451cea3f62a1b53c441995c8e1f052875c4fb3bd (diff) | |
| parent | cdc4e9ebce32aa41cef21d2f821959d6cd08e064 (diff) | |
| download | mariadb-git-77854696c4d0cab8ff56ea68e82879e87f30083c.tar.gz | |
merge mysql-5.1-bugteam (local) --> mysql-5.1-bugteam
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 ec9199b33a5..1f3d29ffec0 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -2737,6 +2737,10 @@ mysql_execute_command(THD *thd) } } + /* So that CREATE TEMPORARY TABLE gets to binlog at commit/rollback */ + if (create_info.options & HA_LEX_CREATE_TMP_TABLE) + thd->options|= OPTION_KEEP_LOG; + /* select_create is currently not re-execution friendly and needs to be created for every execution of a PS/SP. |