diff options
| author | unknown <reggie@poseidon.ndb.mysql.com> | 2005-11-07 20:29:58 +0100 |
|---|---|---|
| committer | unknown <reggie@poseidon.ndb.mysql.com> | 2005-11-07 20:29:58 +0100 |
| commit | bc0292087ffecb979dd215037cc5aa79ffeee9ce (patch) | |
| tree | 44de241bbcdf7eaacea45e83b582ba47f7984e57 /storage | |
| parent | ba009e820e0f659d5c6cabe3daac89edc994cfc7 (diff) | |
| parent | 9ea37cf25a525c6b775db2868fd129c053df11e4 (diff) | |
| download | mariadb-git-bc0292087ffecb979dd215037cc5aa79ffeee9ce.tar.gz | |
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp b/storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp index 8ce42b1dcf8..90054b54c75 100644 --- a/storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp +++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp @@ -1352,6 +1352,9 @@ int Dbtup::handleInsertReq(Signal* signal, Uint32 *dst, *ptr= 0; Tuple_header *base= req_struct->m_tuple_ptr, *org= base; Tuple_header *tuple_ptr; + bool disk, mem_insert, disk_insert; + Uint32 frag_page_id, real_page_id; + if ((dst= c_undo_buffer.alloc_copy_tuple(®OperPtr.p->m_copy_tuple_location, regTabPtr->total_rec_size)) == 0) @@ -1364,9 +1367,9 @@ int Dbtup::handleInsertReq(Signal* signal, ndbout << "dst: " << hex << UintPtr(dst) << " - " << regOperPtr.p->m_copy_tuple_location << endl; - bool disk = regTabPtr->m_no_of_disk_attributes > 0; - bool mem_insert = get_tuple_state(regOperPtr.p) == TUPLE_INITIAL_INSERT; - bool disk_insert = regOperPtr.p->is_first_operation() && disk; + disk = regTabPtr->m_no_of_disk_attributes > 0; + mem_insert = get_tuple_state(regOperPtr.p) == TUPLE_INITIAL_INSERT; + disk_insert = regOperPtr.p->is_first_operation() && disk; union { Uint32 sizes[4]; @@ -1433,8 +1436,8 @@ int Dbtup::handleInsertReq(Signal* signal, /** * Alloc memory */ - Uint32 frag_page_id = req_struct->frag_page_id; - Uint32 real_page_id = regOperPtr.p->m_tuple_location.m_page_no; + frag_page_id = req_struct->frag_page_id; + real_page_id = regOperPtr.p->m_tuple_location.m_page_no; if(mem_insert) { if (!regTabPtr->m_attributes[MM].m_no_of_varsize) |