Commit 815f6222 authored by unknown's avatar unknown

bug#7761 - ndb does not autcommit - postreview fixes


sql/sql_table.cc:
  Move ha_enable to before new Copy, to ensure no memory is leaked
parent b4871e29
...@@ -3444,21 +3444,18 @@ copy_data_between_tables(TABLE *from,TABLE *to, ...@@ -3444,21 +3444,18 @@ copy_data_between_tables(TABLE *from,TABLE *to,
ulong save_sql_mode; ulong save_sql_mode;
DBUG_ENTER("copy_data_between_tables"); DBUG_ENTER("copy_data_between_tables");
if (!(copy= new Copy_field[to->fields]))
DBUG_RETURN(-1); /* purecov: inspected */
/* /*
Turn off recovery logging since rollback of an alter table is to Turn off recovery logging since rollback of an alter table is to
delete the new table so there is no need to log the changes to it. delete the new table so there is no need to log the changes to it.
This needs to be done before external_lock This needs to be done before external_lock
*/ */
error= ha_enable_transaction(thd,FALSE); error= ha_enable_transaction(thd, FALSE);
if (error) if (error)
{
DBUG_RETURN(-1); DBUG_RETURN(-1);
}
if (!(copy= new Copy_field[to->fields]))
DBUG_RETURN(-1); /* purecov: inspected */
if (to->file->external_lock(thd, F_WRLCK)) if (to->file->external_lock(thd, F_WRLCK))
DBUG_RETURN(-1); DBUG_RETURN(-1);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment