mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 04:53:01 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge perch.ndb.mysql.com:/home/jonas/src/51-new

Browse source 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
This commit is contained in:
unknown 2006-01-27 15:59:00 +01:00
commit a176516894
2 changed files with 23 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
View file

@ -5984,6 +5984,17 @@ void Dbdict::handleTabInfoInit(SimpleProperties::Reader & it,
* Release table
*/
releaseTableObject(tablePtr.i, checkExist);
return;
}
if (checkExist && tablePtr.p->m_tablespace_id != RNIL)
{
/**
* Increase ref count
*/
FilegroupPtr ptr;
ndbrequire(c_filegroup_hash.find(ptr, tablePtr.p->m_tablespace_id));
increase_ref_count(ptr.p->m_obj_ptr_i);
}
}//handleTabInfoInit()
@ -6238,15 +6249,6 @@ void Dbdict::handleTabInfo(SimpleProperties::Reader & it,
{
tabRequire(false, CreateTableRef::InvalidTablespaceVersion);
}
{
/**
* Increase ref count
*/
FilegroupPtr ptr;
ndbrequire(c_filegroup_hash.find(ptr, tablePtr.p->m_tablespace_id));
increase_ref_count(ptr.p->m_obj_ptr_i);
}
}
}//handleTabInfo()

19
storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp
View file

@ -352,16 +352,21 @@ Dbtup::disk_page_prealloc(Signal* signal,
while((pageBits= tsman.alloc_page_from_extent(&ext.p->m_key, bits)) < 0)
if(!list.next(ext) || ++cnt == 10)
break;
ndbout_c("cnt: %d", cnt);
if (cnt == 10 || ext.isNull())
goto alloc;
list.remove(ext);
alloc.m_curr_extent_info_ptr_i= ext.i;
ext.p->m_free_matrix_pos= RNIL;
{
pos = RNIL;
}
else
{
list.remove(ext);
alloc.m_curr_extent_info_ptr_i= ext.i;
ext.p->m_free_matrix_pos= RNIL;
}
}
else
if (pos == RNIL)
{
alloc:
jam();
/**
* We need to alloc an extent