bk commit into 5.1 tree (jonas:1.1979)

[jonas]

Below is the list of changes that have just been committed into a local
5.1 repository of jonas. When jonas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1979 05/12/26 09:49:51 jonas@eel.(none) +4 -0
  ndb - opt.nr
    fix basic NR of disk data

  storage/ndb/src/kernel/blocks/tsman.cpp
    1.3 05/12/26 09:49:43 jonas@eel.(none) +2 -2
    Reuse files during NR
    Better flags for tup scan in disk order

  storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp
    1.14 05/12/26 09:49:43 jonas@eel.(none) +1 -1
    Better flags for tup scan in disk order

  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
    1.95 05/12/26 09:49:43 jonas@eel.(none) +3 -7
    Use new method during NR
    Scan in mem order during NR (even for disk...)

  storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
    1.66 05/12/26 09:49:43 jonas@eel.(none) +0 -2
    Allow reuse of dd files for NR

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jonas
# Host:	eel.(none)
# Root:	/home/jonas/src/51-ndb

--- 1.2/storage/ndb/src/kernel/blocks/tsman.cpp	2005-11-10 12:04:37 +01:00
+++ 1.3/storage/ndb/src/kernel/blocks/tsman.cpp	2005-12-26 09:49:43 +01:00
@@ -1084,7 +1084,7 @@
 
   Ptr<Tablespace> ts_ptr;
   m_tablespace_pool.getPtr(ts_ptr, ptr.p->m_tablespace_ptr_i);
-  if (!getNodeState().getSystemRestartInProgress())
+  if (getNodeState().startLevel >= NodeState::SL_STARTED)
   {
     LocalDLList<Datafile> free(m_file_pool, ts_ptr.p->m_free_files);
     LocalDLList<Datafile> meta(m_file_pool, ts_ptr.p->m_meta_files);
@@ -1644,7 +1644,7 @@
   /**
    * Handling of unmapped extent header pages is not implemented
    */
-  int flags = Page_cache_client::COMMIT_REQ;
+  int flags = 0;
   int real_page_id;
   if ((real_page_id = m_page_cache_client.get_page(signal, preq, flags)) > 0)
   {

--- 1.65/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp	2005-12-21 16:47:15 +01:00
+++ 1.66/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp	2005-12-26 09:49:43 +01:00
@@ -14852,8 +14852,6 @@
     break;
   case 1:
     req->requestInfo = CreateFileImplReq::Open;
-    if(getNodeState().getNodeRestartInProgress())
-      req->requestInfo = CreateFileImplReq::CreateForce;      
     break;
   case 2:
     req->requestInfo = CreateFileImplReq::CreateForce;

--- 1.94/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2005-12-23 08:34:19 +01:00
+++ 1.95/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2005-12-26 09:49:43 +01:00
@@ -119,7 +119,7 @@
 const Uint32 NR_ScanNo = 0;
 
 #if defined VM_TRACE || defined ERROR_INSERT || defined NDBD_TRACENR
-static FileOutputStream tracenr_fos(fopen("ndbd_tracenr.log", "w+"));
+static FileOutputStream tracenr_fos(fopen("tracenr.log", "w+"));
 NdbOut tracenrout(tracenr_fos);
 static int TRACENR_FLAG = 0;
 #define TRACENR(x) tracenrout << x
@@ -4082,12 +4082,7 @@
   jamEntry();
 
   ndbrequire(regTcPtr.p->m_dealloc == 1);  
-  signal->theData[0] = regTcPtr.p->fragmentid;
-  signal->theData[1] = regTcPtr.p->tableref;
-  signal->theData[2] = regTcPtr.p->m_row_id.m_page_no;
-  signal->theData[3] = regTcPtr.p->m_row_id.m_page_idx;
-  signal->theData[4] = RNIL;
-  EXECUTE_DIRECT(DBTUP, GSN_TUP_DEALLOCREQ, signal, 5);
+  c_tup->nr_delete(signal, fragPtr.p->tupFragptr, &regTcPtr.p->m_row_id);
   jamEntry();
 
   TRACENR("DELETED: " << regTcPtr.p->m_row_id << endl);
@@ -9671,6 +9666,7 @@
   AccScanReq::setLockMode(req->requestInfo, 0);
   AccScanReq::setReadCommittedFlag(req->requestInfo, 0);
   AccScanReq::setNRScanFlag(req->requestInfo, gci ? 1 : 0);
+  AccScanReq::setNoDiskScanFlag(req->requestInfo, 1);
 
   req->transId1 = tcConnectptr.p->transid[0];
   req->transId2 = tcConnectptr.p->transid[1];

--- 1.13/storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp	2005-12-21 16:41:52 +01:00
+++ 1.14/storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp	2005-12-26 09:49:43 +01:00
@@ -710,7 +710,7 @@
         preq.m_callback.m_callbackData = scanPtr.i;
         preq.m_callback.m_callbackFunction =
           safe_cast(&Dbtup::disk_page_tup_scan_callback);
-        int flags = 0;
+        int flags = Page_cache_client::STRICT_ORDER;
         int res = m_pgman.get_page(signal, preq, flags);
         if (res == 0) {
           jam();