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:
reggie@poseidon.ndb.mysql.com 2005-11-07 20:29:58 +01:00
commit b272c5b1e5
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp
View File

@ -1352,6 +1352,9 @@ int Dbtup::handleInsertReq(Signal* signal,
Uint32 *dst, *ptr= 0; Uint32 *dst, *ptr= 0;
Tuple_header *base= req_struct->m_tuple_ptr, *org= base; Tuple_header *base= req_struct->m_tuple_ptr, *org= base;
Tuple_header *tuple_ptr; Tuple_header *tuple_ptr;
bool disk, mem_insert, disk_insert;
Uint32 frag_page_id, real_page_id;
if ((dst= if ((dst=
c_undo_buffer.alloc_copy_tuple(&regOperPtr.p->m_copy_tuple_location, c_undo_buffer.alloc_copy_tuple(&regOperPtr.p->m_copy_tuple_location,
regTabPtr->total_rec_size)) == 0) regTabPtr->total_rec_size)) == 0)
@ -1364,9 +1367,9 @@ int Dbtup::handleInsertReq(Signal* signal,
ndbout << "dst: " << hex << UintPtr(dst) << " - " ndbout << "dst: " << hex << UintPtr(dst) << " - "
<< regOperPtr.p->m_copy_tuple_location << endl; << regOperPtr.p->m_copy_tuple_location << endl;
bool disk = regTabPtr->m_no_of_disk_attributes > 0; disk = regTabPtr->m_no_of_disk_attributes > 0;
bool mem_insert = get_tuple_state(regOperPtr.p) == TUPLE_INITIAL_INSERT; mem_insert = get_tuple_state(regOperPtr.p) == TUPLE_INITIAL_INSERT;
bool disk_insert = regOperPtr.p->is_first_operation() && disk; disk_insert = regOperPtr.p->is_first_operation() && disk;
union { union {
Uint32 sizes[4]; Uint32 sizes[4];
@ -1433,8 +1436,8 @@ int Dbtup::handleInsertReq(Signal* signal,
/** /**
* Alloc memory * Alloc memory
*/ */
Uint32 frag_page_id = req_struct->frag_page_id; frag_page_id = req_struct->frag_page_id;
Uint32 real_page_id = regOperPtr.p->m_tuple_location.m_page_no; real_page_id = regOperPtr.p->m_tuple_location.m_page_no;
if(mem_insert) if(mem_insert)
{ {
if (!regTabPtr->m_attributes[MM].m_no_of_varsize) if (!regTabPtr->m_attributes[MM].m_no_of_varsize)