Commit 16f9e514 authored by unknown's avatar unknown
Browse files

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

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
parents ab0e66a8 73c0d7c0

BUILD/compile-ndb-autotest

0 → 100755
+9 −0
Original line number Diff line number Diff line 
#! /bin/sh



path=`dirname $0`

. "$path/SETUP.sh"



extra_flags="$fast_cflags $max_cflags -g"

extra_configs="$max_configs --with-ndb-test --with-ndb-ccflags="-DERROR_INSERT""



. "$path/FINISH.sh"

storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp

+3 −0
Original line number Diff line number Diff line
@@ -246,6 +246,7 @@ inline const Uint32* ALIGN_WORD(const void* ptr) 
#define ZTUP_SCAN 10

#define ZFREE_EXTENT 11

#define ZUNMAP_PAGES 12

#define ZFREE_VAR_PAGES 13



#define ZSCAN_PROCEDURE 0

#define ZCOPY_PROCEDURE 2
@@ -620,6 +621,7 @@ struct Fragrecord { 
  Uint32 m_tablespace_id;

  Uint32 m_logfile_group_id;

  Disk_alloc_info m_disk_alloc_info;

  Uint32 m_var_page_chunks;

};

typedef Ptr<Fragrecord> FragrecordPtr;
@@ -2335,6 +2337,7 @@ private: 




  void releaseFragment(Signal* signal, Uint32 tableId);

  void drop_fragment_free_var_pages(Signal*);

  void drop_fragment_free_exent(Signal*, TablerecPtr, FragrecordPtr, Uint32);

  void drop_fragment_unmap_pages(Signal*, TablerecPtr, FragrecordPtr, Uint32);

  void drop_fragment_unmap_page_callback(Signal* signal, Uint32, Uint32);

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

+6 −0
Original line number Diff line number Diff line
@@ -227,6 +227,12 @@ void Dbtup::execCONTINUEB(Signal* signal) 
    drop_fragment_unmap_pages(signal, tabPtr, fragPtr, signal->theData[3]);

    return;

  }

  case ZFREE_VAR_PAGES:

  {

    ljam();

    drop_fragment_free_var_pages(signal);

    return;

  }

  default:

    ndbrequire(false);

    break;

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

+40 −1
Original line number Diff line number Diff line
@@ -140,6 +140,7 @@ void Dbtup::execTUPFRAGREQ(Signal* signal) 
  regFragPtr.p->m_undo_complete= false;

  regFragPtr.p->m_lcp_scan_op = RNIL; 

  regFragPtr.p->m_lcp_keep_list = RNIL;

  regFragPtr.p->m_var_page_chunks = RNIL;

  

  Uint32 noAllocatedPages= allocFragPages(regFragPtr.p, pages);
@@ -970,7 +971,7 @@ Dbtup::drop_fragment_unmap_pages(Signal *signal, 
    case -1:

      break;

    default:

      ndbrequire(res == pagePtr.i);

      ndbrequire((Uint32)res == pagePtr.i);

      drop_fragment_unmap_page_callback(signal, pos, res);

    }

    return;
@@ -1052,6 +1053,44 @@ Dbtup::drop_fragment_free_exent(Signal *signal, 
    }

  }

  

  signal->theData[0] = ZFREE_VAR_PAGES;

  signal->theData[1] = tabPtr.i;

  signal->theData[2] = fragPtr.i;

  sendSignal(reference(), GSN_CONTINUEB, signal, 3, JBB);  

}



void

Dbtup::drop_fragment_free_var_pages(Signal* signal)

{

  ljam();

  Uint32 tableId = signal->theData[1];

  Uint32 fragPtrI = signal->theData[2];

  

  TablerecPtr tabPtr;

  tabPtr.i= tableId;

  ptrCheckGuard(tabPtr, cnoOfTablerec, tablerec);

  

  FragrecordPtr fragPtr;

  fragPtr.i = fragPtrI;

  ptrCheckGuard(fragPtr, cnoOfFragrec, fragrecord);

  

  PagePtr pagePtr;

  if ((pagePtr.i = fragPtr.p->m_var_page_chunks) != RNIL)

  {

    c_page_pool.getPtr(pagePtr);

    Var_page* page = (Var_page*)pagePtr.p;

    fragPtr.p->m_var_page_chunks = page->next_chunk;



    Uint32 sz = page->chunk_size;

    returnCommonArea(pagePtr.i, sz);

    

    signal->theData[0] = ZFREE_VAR_PAGES;

    signal->theData[1] = tabPtr.i;

    signal->theData[2] = fragPtr.i;

    sendSignal(cownref, GSN_CONTINUEB, signal, 3, JBB);  

    return;

  }

  

  releaseFragPages(fragPtr.p);

  

  Uint32 i;

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

+5 −0
Original line number Diff line number Diff line
@@ -300,6 +300,11 @@ void Dbtup::releaseFragPages(Fragrecord* regFragPtr) 
	tmp.remove();

      }



      {

	LocalSLList<Page> tmp(c_page_pool, regFragPtr->m_empty_pages);

	tmp.remove();

      }

      

      return;

    } else {

      if (regPRPtr.p->type[indexPos] == ZNON_LEAF) {