Commit b4fd92f5 authored by unknown's avatar unknown
Browse files

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
parents c7a5f503 1a16b06e

sql/sql_tablespace.cc

+2 −1
Original line number Diff line number Diff line
@@ -28,7 +28,8 @@ int mysql_alter_tablespace(THD *thd, st_alter_tablespace *ts_info) 
    If the user haven't defined an engine, this will fallback to using the

    default storage engine.

  */

  hton= ha_resolve_by_legacy_type(thd, ts_info->storage_engine);

  hton= ha_resolve_by_legacy_type(thd, ts_info->storage_engine != DB_TYPE_UNKNOWN ?

                                  ts_info->storage_engine : DB_TYPE_DEFAULT);



  if (hton->state == SHOW_OPTION_YES &&

      hton->alter_tablespace && (error= hton->alter_tablespace(thd, ts_info)))

storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp

+9 −2
Original line number Diff line number Diff line
@@ -1911,12 +1911,16 @@ NdbEventBuffer::merge_data(const SubTableData * const sdata, 


  // loop twice where first loop only sets sizes

  int loop;

  int result = 0;

  for (loop = 0; loop <= 1; loop++)

  {

    if (loop == 1)

    {

      if (alloc_mem(data, ptr) != 0)

        DBUG_RETURN_EVENT(-1);

      {

        result = -1;

        goto end;

      }

      *data->sdata = *sdata;

      data->sdata->operation = tp->t3;

    }
@@ -2030,10 +2034,13 @@ NdbEventBuffer::merge_data(const SubTableData * const sdata, 
    }

  }



end:

  // free old data

  NdbMem_Free((char*)olddata.memory);

  assert(m_total_alloc >= olddata.sz);

  m_total_alloc -= olddata.sz;



  DBUG_RETURN_EVENT(0);

  DBUG_RETURN_EVENT(result);

}

 

/*