database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-31 22:22:30 +03:00
Code Activity

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

Browse Source 
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
This commit is contained in:
unknown
2006-06-13 15:33:17 -04:00
parent b19c1896ad 6d3eb3dd65
commit dd02c9d2e4
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp
View File

@@ -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