database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Fix for "innodb_mysql" and "events" failures: we can disable transactionality

Browse Source 
in CREATE SELECT only if the table is not temporary (because
re-enabling causes a commit). In the future we should disable
again for temporary tables; that will probably require changing
ha_enable_transaction().


sql/sql_insert.cc:
  When we disable transactionality in CREATE SELECT, we re-enable it
  at the end and this causes a commit (inside ha_enable_transaction());
  but this is undesired if the created table is temporary (we don't
  want CREATE TEMPORARY TABLE SELECT to commit all previous statements).
  So we disable logging only if the table is not temporary.
  Ideally in the future we would want to lift this restriction which
  sounds stupid, but for Maria it does not matter now (temporary
  tables are not transactional yet).
This commit is contained in:
unknown
2007-10-01 19:39:16 +02:00
parent 69c18ca576
commit ca12435fe1
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
sql/sql_insert.cc
View File

@ -3460,10 +3460,12 @@ select_create::prepare(List<Item> &values, SELECT_LEX_UNIT *u)
/*
If error during the CREATE SELECT we drop the table, so no need for
engines to do logging of insertions (optimization).
engines to do logging of insertions (optimization). We don't do it for
temporary tables (yet) as re-enabling causes an undesirable commit.
*/
if (ha_enable_transaction(thd, FALSE))
DBUG_RETURN(-1);
if (((thd->lex->create_info.options & HA_LEX_CREATE_TMP_TABLE) == 0) &&
ha_enable_transaction(thd, FALSE))
DBUG_RETURN(-1);
if (!(table= create_table_from_items(thd, create_info, create_table,
alter_info, &values,
@ -3605,11 +3607,12 @@ bool select_create::send_eof()
nevertheless.
*/
if (!table->s->tmp_table)
{
ha_enable_transaction(thd, TRUE);
ha_commit(thd); // Can fail, but we proceed anyway
}
table->file->extra(HA_EXTRA_NO_IGNORE_DUP_KEY);
table->file->extra(HA_EXTRA_WRITE_CANNOT_REPLACE);
ha_enable_transaction(thd, TRUE);
if (thd->extra_lock)
{
mysql_unlock_tables(thd, thd->extra_lock);
@ -3632,6 +3635,9 @@ void select_create::abort()
select_insert::abort();
reenable_binlog(thd);
if (table && !table->s->tmp_table)
ha_enable_transaction(thd, TRUE);
/*
We roll back the statement, including truncating the transaction
cache of the binary log, if the statement failed.
@ -3648,8 +3654,6 @@ void select_create::abort()
if (thd->current_stmt_binlog_row_based)
ha_rollback_stmt(thd);
ha_enable_transaction(thd, TRUE);
if (thd->extra_lock)
{
mysql_unlock_tables(thd, thd->extra_lock);