From 28814b66f4a8e02361fec8c03ee6bb899c0dd82f Mon Sep 17 00:00:00 2001
From: "joreland@mysql.com" <>
Date: Mon, 9 May 2005 11:03:07 +0200
Subject: [PATCH 1/4] bug#10142 - ndb unique index resource shortage   honor
 abort_option as TC now abort on 288

---
 ndb/src/ndbapi/NdbIndexOperation.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ndb/src/ndbapi/NdbIndexOperation.cpp b/ndb/src/ndbapi/NdbIndexOperation.cpp
index c24e7db5942..39da9c5f5d0 100644
--- a/ndb/src/ndbapi/NdbIndexOperation.cpp
+++ b/ndb/src/ndbapi/NdbIndexOperation.cpp
@@ -752,5 +752,5 @@ NdbIndexOperation::receiveTCINDXREF( NdbApiSignal* aSignal)
   Uint32 errorCode = tcIndxRef->errorCode;
   theError.code = errorCode;
   theNdbCon->setOperationErrorCodeAbort(errorCode);
-  return theNdbCon->OpCompleteFailure(AbortOnError);
+  return theNdbCon->OpCompleteFailure(theNdbCon->m_abortOption);
 }//NdbIndexOperation::receiveTCINDXREF()

From f285a1a40e6f7c1938fd0f41620e733094858ebc Mon Sep 17 00:00:00 2001
From: "msvensson@neptunus.(none)" <>
Date: Mon, 9 May 2005 11:26:03 +0200
Subject: [PATCH 2/4] Fix check-cpu, add more recognized cpus

---
 BUILD/check-cpu | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/BUILD/check-cpu b/BUILD/check-cpu
index ce106e5a603..d50a83a5475 100755
--- a/BUILD/check-cpu
+++ b/BUILD/check-cpu
@@ -33,6 +33,9 @@ else
   esac
 fi
 
+cpu_flag=""
+cpu_flag_obs=""
+
 case "$cpu_family--$model_name" in
   Alpha*EV6*)
     cpu_flag="ev6";
@@ -40,11 +43,21 @@ case "$cpu_family--$model_name" in
   *Xeon*)
     cpu_flag="nocona";
     ;;
+  *Pentium*4*Mobile*CPU*)
+    cpu_flag="pentium4m";
+  ;;
   *Pentium*4*CPU*)
     cpu_flag="pentium4";
     ;;
+  *Pentium*III*Mobile*CPU*)
+    cpu_flag="pentium3m";
+  ;;
+  *Pentium*III*CPU*)
+    cpu_flag="pentium3";
+  ;;
   *Athlon*64*)
     cpu_flag="athlon64";
+    cpu_flag_obs="athlon";
     ;;
   *Athlon*)
     cpu_flag="athlon";
@@ -84,6 +97,9 @@ case "$cc_ver--$cc_verno" in
     check_cpu_cflags="-mtune=$cpu_flag -march=$cpu_flag"
     ;;
   *GCC*)
+    # Fix for older compiler versions
+    if test -z "$cpu_flag_obs"; then
+      cpu_flag=$cpu_flag_obs;
     check_cpu_cflags="-mcpu=$cpu_flag -march=$cpu_flag"
     ;;
   *)

From 82e6d15be58754aa4635ffddc550d76628c00266 Mon Sep 17 00:00:00 2001
From: "msvensson@neptunus.(none)" <>
Date: Mon, 9 May 2005 14:49:27 +0200
Subject: [PATCH 3/4] Fixes after review

---
 BUILD/check-cpu | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/BUILD/check-cpu b/BUILD/check-cpu
index d50a83a5475..dfdf96d6b29 100755
--- a/BUILD/check-cpu
+++ b/BUILD/check-cpu
@@ -34,7 +34,7 @@ else
 fi
 
 cpu_flag=""
-cpu_flag_obs=""
+cpu_flag_old=""
 
 case "$cpu_family--$model_name" in
   Alpha*EV6*)
@@ -57,7 +57,7 @@ case "$cpu_family--$model_name" in
   ;;
   *Athlon*64*)
     cpu_flag="athlon64";
-    cpu_flag_obs="athlon";
+    cpu_flag_old="athlon";
     ;;
   *Athlon*)
     cpu_flag="athlon";
@@ -98,8 +98,9 @@ case "$cc_ver--$cc_verno" in
     ;;
   *GCC*)
     # Fix for older compiler versions
-    if test -z "$cpu_flag_obs"; then
-      cpu_flag=$cpu_flag_obs;
+    if test -n "$cpu_flag_old"; then
+      cpu_flag="$cpu_flag_old"
+    fi
     check_cpu_cflags="-mcpu=$cpu_flag -march=$cpu_flag"
     ;;
   *)

From f2edd8069f9c9c84f6f554ad74991a83985ec9e8 Mon Sep 17 00:00:00 2001
From: "joreland@mysql.com" <>
Date: Mon, 9 May 2005 14:59:49 +0200
Subject: [PATCH 4/4] bug#10471 - ndb - potential inconsistent backup   whith
 some multi update scenarios

  Make sure to init GCI on correct operation before firering operation
---
 ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp b/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp
index cbd56c3281f..470b98fd04c 100644
--- a/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp
+++ b/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp
@@ -443,6 +443,7 @@ Dbtup::commitRecord(Signal* signal,
     saveAttributeMask.bitOR(befOpPtr.p->changeMask);
     befOpPtr.p->changeMask.clear();
     befOpPtr.p->changeMask.bitOR(attributeMask);
+    befOpPtr.p->gci = regOperPtr->gci;
     
     operPtr.p = befOpPtr.p;
     checkDetachedTriggers(signal,
@@ -480,6 +481,7 @@ Dbtup::commitRecord(Signal* signal,
     befOpPtr.p->pageOffset = befOpPtr.p->pageOffsetC;
     befOpPtr.p->fragPageId = befOpPtr.p->fragPageIdC;
     befOpPtr.p->pageIndex  = befOpPtr.p->pageIndexC;
+    befOpPtr.p->gci = regOperPtr->gci;
 
     operPtr.p = befOpPtr.p;
     checkDetachedTriggers(signal,