1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
This commit is contained in:
unknown 2006-04-24 13:47:18 +02:00
commit b4fd92f507
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_tablespace.cc
View File

@ -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 If the user haven't defined an engine, this will fallback to using the
default storage engine. 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 && if (hton->state == SHOW_OPTION_YES &&
hton->alter_tablespace && (error= hton->alter_tablespace(thd, ts_info))) hton->alter_tablespace && (error= hton->alter_tablespace(thd, ts_info)))

11
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp
View File

@ -1911,12 +1911,16 @@ NdbEventBuffer::merge_data(const SubTableData * const sdata,
// loop twice where first loop only sets sizes // loop twice where first loop only sets sizes
int loop; int loop;
int result = 0;
for (loop = 0; loop <= 1; loop++) for (loop = 0; loop <= 1; loop++)
{ {
if (loop == 1) if (loop == 1)
{ {
if (alloc_mem(data, ptr) != 0) if (alloc_mem(data, ptr) != 0)
DBUG_RETURN_EVENT(-1); {
result = -1;
goto end;
}
*data->sdata = *sdata; *data->sdata = *sdata;
data->sdata->operation = tp->t3; data->sdata->operation = tp->t3;
} }
@ -2030,10 +2034,13 @@ NdbEventBuffer::merge_data(const SubTableData * const sdata,
} }
} }
end:
// free old data // free old data
NdbMem_Free((char*)olddata.memory); NdbMem_Free((char*)olddata.memory);
assert(m_total_alloc >= olddata.sz);
m_total_alloc -= olddata.sz;
DBUG_RETURN_EVENT(0); DBUG_RETURN_EVENT(result);
} }
/* /*