diff --git a/BUILD/check-cpu b/BUILD/check-cpu index ce106e5a60307e0764e7f8896a7b4f6825629226..dfdf96d6b294fefe8c3a894d43d904e2c93dcc40 100755 --- a/BUILD/check-cpu +++ b/BUILD/check-cpu @@ -33,6 +33,9 @@ else esac fi +cpu_flag="" +cpu_flag_old="" + 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_old="athlon"; ;; *Athlon*) cpu_flag="athlon"; @@ -84,6 +97,10 @@ case "$cc_ver--$cc_verno" in check_cpu_cflags="-mtune=$cpu_flag -march=$cpu_flag" ;; *GCC*) + # Fix for older compiler versions + if test -n "$cpu_flag_old"; then + cpu_flag="$cpu_flag_old" + fi check_cpu_cflags="-mcpu=$cpu_flag -march=$cpu_flag" ;; *) diff --git a/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp b/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp index cbd56c3281f3285cc11c91901c8507b57925159a..470b98fd04cd6169cf3c10d49327c25e63b724eb 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,