diff options
| author | unknown <cmiller@zippy.(none)> | 2006-05-26 12:10:35 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.(none)> | 2006-05-26 12:10:35 -0400 |
| commit | 54f5525ac736abd0bbee7d96583a093265e02ed0 (patch) | |
| tree | 9c637aa61be5d985f4ad429d8cb1375b6864416f /storage | |
| parent | 97e2016e01ab3a389d5d1433de209cd0f09b9081 (diff) | |
| parent | 51ad63b153cf98dae44a37b16817259c566614ef (diff) | |
| download | mariadb-git-54f5525ac736abd0bbee7d96583a093265e02ed0.tar.gz | |
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
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp b/storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp index 1b6fef9de37..7047dc65bf3 100644 --- a/storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp +++ b/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 |