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

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


include/my_sys.h:
  Auto merged
mysql-test/t/rpl_temporary.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Auto merged
storage/ndb/test/ndbapi/Makefile.am:
  Auto merged
storage/ndb/test/ndbapi/testInterpreter.cpp:
  Auto merged

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

@@ -1927,8 +1927,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