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

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

Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new
8e2aee1c · cmiller@zippy.(none) · d2b04770 · e51b1223 · 8e2aee1c
Commit 8e2aee1c authored Jun 13, 2006 by cmiller@zippy.(none)
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp +1 -2

No files found.
--- a/storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp
@@ -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