bk commit into 4.1 tree (jonas:1.2450) BUG#12950

[jonas]

Below is the list of changes that have just been committed into a local
4.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.2450 05/09/21 17:06:49 jonas@stripped +3 -0
  bug#12950
    ndb backup with charsets and simultanious updates
    make sure that backup _dont_ read xfrm data

  ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp
    1.8 05/09/21 17:06:47 jonas@stripped +7 -5
    Fix so that backup dont read xfrm data

  ndb/src/kernel/blocks/dbtup/Dbtup.hpp
    1.20 05/09/21 17:06:47 jonas@stripped +2 -1
    Fix so that backup dont read xfrm data

  ndb/src/kernel/blocks/backup/Backup.cpp
    1.21 05/09/21 17:06:47 jonas@stripped +1 -0
    Backup can do dirty read

# 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:	perch.ndb.mysql.com
# Root:	/home/jonas/src/mysql-4.1-push

--- 1.20/ndb/src/kernel/blocks/backup/Backup.cpp	2005-09-08 15:24:16 +02:00
+++ 1.21/ndb/src/kernel/blocks/backup/Backup.cpp	2005-09-21 17:06:47 +02:00
@@ -3265,6 +3265,7 @@
     req->requestInfo = 0;
     req->savePointId = 0;
     req->tableId = table.tableId;
+    ScanFragReq::setReadCommittedFlag(req->requestInfo, 1);
     ScanFragReq::setLockMode(req->requestInfo, 0);
     ScanFragReq::setHoldLockFlag(req->requestInfo, 0);
     ScanFragReq::setKeyinfoFlag(req->requestInfo, 0);

--- 1.19/ndb/src/kernel/blocks/dbtup/Dbtup.hpp	2005-08-31 16:14:58 +02:00
+++ 1.20/ndb/src/kernel/blocks/dbtup/Dbtup.hpp	2005-09-21 17:06:47 +02:00
@@ -1737,7 +1737,8 @@
                        Uint32* const mainBuffer,
                        Uint32& noMainWords,
                        Uint32* const copyBuffer,
-                       Uint32& noCopyWords);
+                       Uint32& noCopyWords,
+		       bool xfrm);
 
   void sendTrigAttrInfo(Signal*        signal, 
                         Uint32*        data, 

--- 1.7/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp	2005-09-15 14:47:19 +02:00
+++ 1.8/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp	2005-09-21 17:06:47 +02:00
@@ -622,7 +622,8 @@
                        mainBuffer,
                        noMainWords,
                        copyBuffer,
-                       noCopyWords)) {
+                       noCopyWords,
+		       (ref == BACKUP ? false : true))) {
     ljam();
     return;
   }//if
@@ -727,7 +728,8 @@
                             Uint32*  const mainBuffer,
                             Uint32& noMainWords,
                             Uint32* const copyBuffer,
-                            Uint32& noCopyWords)
+                            Uint32& noCopyWords,
+			    bool xfrm)
 {
   noCopyWords = 0;
   noMainWords = 0;
@@ -757,7 +759,7 @@
 			  regTabPtr->noOfKeyAttr,
 			  keyBuffer,
 			  ZATTR_BUFFER_SIZE,
-			  true);
+			  xfrm);
   ndbrequire(ret != -1);
   noPrimKey= ret;
 
@@ -800,7 +802,7 @@
 			    numAttrsToRead,
 			    mainBuffer,
 			    ZATTR_BUFFER_SIZE,
-			    true);
+			    xfrm);
     ndbrequire(ret != -1);
     noMainWords= ret;
   } else {
@@ -826,7 +828,7 @@
 			    numAttrsToRead,
 			    copyBuffer,
 			    ZATTR_BUFFER_SIZE,
-			    true);
+			    xfrm);
 
     ndbrequire(ret != -1);
     noCopyWords = ret;