Commit dd02c9d2 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.1 

into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new


include/my_sys.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Auto merged
parents b19c1896 6d3eb3dd

storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp

+1 −2
Original line number Diff line number Diff line
@@ -1839,8 +1839,7 @@ int Dbtup::interpreterNextLab(Signal* signal, 
	    /* ------------------------------------------------------------- */

	    TregMemBuffer[theRegister]= 0x50;

            // arithmetic conversion if big-endian

            * (Int64*)(TregMemBuffer+theRegister+2)=

                                       TregMemBuffer[theRegister+1];

            * (Int64*)(TregMemBuffer+theRegister+2)= TregMemBuffer[theRegister+1];

	  } else if (TnoDataRW == 3) {

	    /* ------------------------------------------------------------- */

	    // Three words read means that we get the instruction plus two