Commit 6748f7f4 authored by unknown's avatar unknown
Browse files

merge 


include/my_global.h:
  Auto merged
ndb/src/cw/cpcd/Process.cpp:
  Auto merged
ndb/src/kernel/error/ErrorReporter.cpp:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/sql_udf.h:
  Auto merged
parents 438eeda6 50a051bb

BUILD/check-cpu

+17 −0
Original line number Diff line number Diff line
@@ -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"

    ;;

  *)

ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp

+2 −0
Original line number Diff line number Diff line
@@ -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,