Commit 815f6222 authored by unknown's avatar unknown
Browse files

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

sql/sql_table.cc

+4 −7
Original line number Diff line number Diff line
@@ -3444,9 +3444,6 @@ copy_data_between_tables(TABLE *from,TABLE *to, 
  ulong save_sql_mode;

  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

    delete the new table so there is no need to log the changes to it.
@@ -3455,10 +3452,10 @@ copy_data_between_tables(TABLE *from,TABLE *to, 
  */

  error= ha_enable_transaction(thd, FALSE);

  if (error)

  {

    DBUG_RETURN(-1);

  }

  

  if (!(copy= new Copy_field[to->fields]))

    DBUG_RETURN(-1);				/* purecov: inspected */



  if (to->file->external_lock(thd, F_WRLCK))

    DBUG_RETURN(-1);