merge mysql-5.1-bugteam (local) --> mysql-5.1-bugteam

This commit is contained in:
Alfranio Correia 2010-06-17 01:25:07 +01:00
commit cdc4e9ebce
8 changed files with 191 additions and 42 deletions

View file

@ -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.