Merge bk-internal:/home/bk/mysql-5.1-new (56842e5e) · Commits · Software / OSDI20 Artifacts / mariadb

storage/ndb/src/kernel/blocks/dbtup/DbtupBuffer.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -132,7 +132,7 @@ void Dbtup::updatePackedList(Signal* signal, Uint16 hostId)
		void Dbtup::sendReadAttrinfo(Signal* signal,
		KeyReqStruct *req_struct,
		Uint32 ToutBufIndex,
		const Operationrec * const regOperPtr)
		const Operationrec *regOperPtr)
		{
		if(ToutBufIndex == 0)
		return;

storage/ndb/src/kernel/blocks/dbtup/DbtupFixAlloc.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -242,8 +242,8 @@ Dbtup::alloc_page(Tablerec* tabPtrP, Fragrecord* fragPtrP,
		}

		Uint32*
		Dbtup::alloc_fix_rowid(Fragrecord* const regFragPtr,
		Tablerec* const regTabPtr,
		Dbtup::alloc_fix_rowid(Fragrecord* regFragPtr,
		Tablerec* regTabPtr,
		Local_key* key,
		Uint32 * out_frag_page_id)
		{

storage/ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp

+4 −4

Original line number	Diff line number	Diff line
		@@ -89,7 +89,7 @@
		//
		// The full page range struct

		Uint32 Dbtup::getEmptyPage(Fragrecord* const regFragPtr)
		Uint32 Dbtup::getEmptyPage(Fragrecord* regFragPtr)
		{
		Uint32 pageId = regFragPtr->emptyPrimPage.firstItem;
		if (pageId == RNIL) {
		@@ -108,7 +108,7 @@ Uint32 Dbtup::getEmptyPage(Fragrecord* const regFragPtr)
		return pageId;
		}//Dbtup::getEmptyPage()

		Uint32 Dbtup::getRealpid(Fragrecord* const regFragPtr, Uint32 logicalPageId)
		Uint32 Dbtup::getRealpid(Fragrecord* regFragPtr, Uint32 logicalPageId)
		{
		PageRangePtr grpPageRangePtr;
		Uint32 loopLimit;
		@@ -241,7 +241,7 @@ bool Dbtup::insertPageRangeTab(Fragrecord* const regFragPtr,
		}//Dbtup::insertPageRangeTab()


		void Dbtup::releaseFragPages(Fragrecord* const regFragPtr)
		void Dbtup::releaseFragPages(Fragrecord* regFragPtr)
		{
		if (regFragPtr->rootPageRange == RNIL) {
		ljam();
		@@ -349,7 +349,7 @@ void Dbtup::initFragRange(Fragrecord* const regFragPtr)
		regFragPtr->nextStartRange = 0;
		}//initFragRange()

		Uint32 Dbtup::allocFragPages(Fragrecord* const regFragPtr, Uint32 tafpNoAllocRequested)
		Uint32 Dbtup::allocFragPages(Fragrecord* regFragPtr, Uint32 tafpNoAllocRequested)
		{
		Uint32 tafpPagesAllocated = 0;
		while (true) {

storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -28,7 +28,7 @@
		#define ljamEntry() { jamEntryLine(3000 + __LINE__); }

		void
		Dbtup::setUpQueryRoutines(Tablerec* const regTabPtr)
		Dbtup::setUpQueryRoutines(Tablerec *regTabPtr)
		{
		Uint32 startDescriptor= regTabPtr->tabDescriptor;
		ndbrequire((startDescriptor + (regTabPtr->m_no_of_attributes << ZAD_LOG_SIZE))

storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp

+18 −18

Original line number	Diff line number	Diff line
		@@ -356,8 +356,8 @@ Dbtup::dropTrigger(Tablerec* table, const DropTrigReq* req)
		/* ---------------------------------------------------------------- */
		void
		Dbtup::checkImmediateTriggersAfterInsert(KeyReqStruct *req_struct,
		Operationrec* const regOperPtr,
		Tablerec* const regTablePtr)
		Operationrec *regOperPtr,
		Tablerec *regTablePtr)
		{
		if(refToBlock(req_struct->TC_ref) != DBTC) {
		return;
		@@ -374,8 +374,8 @@ Dbtup::checkImmediateTriggersAfterInsert(KeyReqStruct *req_struct,

		void
		Dbtup::checkImmediateTriggersAfterUpdate(KeyReqStruct *req_struct,
		Operationrec* const regOperPtr,
		Tablerec* const regTablePtr)
		Operationrec* regOperPtr,
		Tablerec* regTablePtr)
		{
		if(refToBlock(req_struct->TC_ref) != DBTC) {
		return;
		@@ -399,8 +399,8 @@ Dbtup::checkImmediateTriggersAfterUpdate(KeyReqStruct *req_struct,

		void
		Dbtup::checkImmediateTriggersAfterDelete(KeyReqStruct *req_struct,
		Operationrec* const regOperPtr,
		Tablerec* const regTablePtr)
		Operationrec* regOperPtr,
		Tablerec* regTablePtr)
		{
		if(refToBlock(req_struct->TC_ref) != DBTC) {
		return;
		@@ -444,8 +444,8 @@ void Dbtup::checkDeferredTriggers(Signal* signal,
		/* */
		/* ---------------------------------------------------------------- */
		void Dbtup::checkDetachedTriggers(KeyReqStruct *req_struct,
		Operationrec* const regOperPtr,
		Tablerec* const regTablePtr)
		Operationrec* regOperPtr,
		Tablerec* regTablePtr)
		{
		Uint32 save_type = regOperPtr->op_struct.op_type;
		Tuple_header *save_ptr = req_struct->m_tuple_ptr;
		@@ -1049,9 +1049,9 @@ void Dbtup::sendFireTrigOrd(Signal* signal,

		int
		Dbtup::executeTuxInsertTriggers(Signal* signal,
		Operationrec* const regOperPtr,
		Fragrecord* const regFragPtr,
		Tablerec* const regTabPtr)
		Operationrec* regOperPtr,
		Fragrecord* regFragPtr,
		Tablerec* regTabPtr)
		{
		TuxMaintReq* const req = (TuxMaintReq*)signal->getDataPtrSend();
		// fill in constant part
		@@ -1066,9 +1066,9 @@ Dbtup::executeTuxInsertTriggers(Signal* signal,

		int
		Dbtup::executeTuxUpdateTriggers(Signal* signal,
		Operationrec* const regOperPtr,
		Fragrecord* const regFragPtr,
		Tablerec* const regTabPtr)
		Operationrec* regOperPtr,
		Fragrecord* regFragPtr,
		Tablerec* regTabPtr)
		{
		TuxMaintReq* const req = (TuxMaintReq*)signal->getDataPtrSend();
		// fill in constant part
		@@ -1139,8 +1139,8 @@ Dbtup::executeTuxDeleteTriggers(Signal* signal,
		void
		Dbtup::executeTuxCommitTriggers(Signal* signal,
		Operationrec* regOperPtr,
		Fragrecord* const regFragPtr,
		Tablerec* const regTabPtr)
		Fragrecord* regFragPtr,
		Tablerec* regTabPtr)
		{
		TuxMaintReq* const req = (TuxMaintReq*)signal->getDataPtrSend();
		Uint32 tupVersion;
		@@ -1174,8 +1174,8 @@ Dbtup::executeTuxCommitTriggers(Signal* signal,
		void
		Dbtup::executeTuxAbortTriggers(Signal* signal,
		Operationrec* regOperPtr,
		Fragrecord* const regFragPtr,
		Tablerec* const regTabPtr)
		Fragrecord* regFragPtr,
		Tablerec* regTabPtr)
		{
		TuxMaintReq* const req = (TuxMaintReq*)signal->getDataPtrSend();
		// get version