bk commit into 5.0 tree (aelkin:1.2144)

[Andrei Elkin]

Below is the list of changes that have just been committed into a local
5.0 repository of elkin. When elkin does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2144 06/05/16 19:33:24 aelkin@stripped +3 -0
  Merge mysql.com:/usr_rh9/home/elkin.rh9/4.1
  into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0

  ndb/test/ndbapi/Makefile.am
    1.25 06/05/16 19:33:18 aelkin@stripped +0 -1
    Auto merged

  ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp
    1.20 06/05/16 19:33:18 aelkin@stripped +0 -0
    Auto merged

  mysql-test/t/rpl_temporary.test
    1.22 06/05/16 19:33:18 aelkin@stripped +0 -0
    Auto merged

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	aelkin
# Host:	dsl-hkigw8-feb0de00-199.dhcp.inet.fi
# Root:	/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0/RESYNC

--- 1.19/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp	2005-02-21 14:14:38 +02:00
+++ 1.20/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp	2006-05-16 19:33:18 +03:00
@@ -1496,6 +1496,7 @@
 	    // word read. Thus we set the register to be a 32 bit register.
 	    /* ------------------------------------------------------------- */
 	    TregMemBuffer[theRegister] = 0x50;
+            // arithmetic conversion if big-endian
             * (Int64*)(TregMemBuffer+theRegister+2) = TregMemBuffer[theRegister+1];
 	  } else if (TnoDataRW == 3) {
 	    /* ------------------------------------------------------------- */
@@ -1554,6 +1555,11 @@
 	  Tlen = TattrNoOfWords + 1;
 	  if (Toptype == ZUPDATE) {
 	    if (TattrNoOfWords <= 2) {
+              if (TattrNoOfWords == 1) {
+                // arithmetic conversion if big-endian
+                TdataForUpdate[1] = *(Int64*)&TregMemBuffer[theRegister + 2];
+                TdataForUpdate[2] = 0;
+              }
 	      if (TregType == 0) {
 		/* --------------------------------------------------------- */
 		// Write a NULL value into the attribute

--- 1.24/ndb/test/ndbapi/Makefile.am	2005-12-27 17:33:52 +02:00
+++ 1.25/ndb/test/ndbapi/Makefile.am	2006-05-16 19:33:18 +03:00
@@ -24,6 +24,7 @@
 testOperations \
 testRestartGci \
 testScan \
+testInterpreter \
 testScanInterpreter \
 testScanPerf \
 testSystemRestart \
@@ -65,6 +66,7 @@
 testOperations_SOURCES = testOperations.cpp
 testRestartGci_SOURCES = testRestartGci.cpp
 testScan_SOURCES = testScan.cpp ScanFunctions.hpp
+testInterpreter_SOURCES = testInterpreter.cpp
 testScanInterpreter_SOURCES = testScanInterpreter.cpp ScanFilter.hpp ScanInterpretTest.hpp 
 testScanPerf_SOURCES = testScanPerf.cpp
 testSystemRestart_SOURCES = testSystemRestart.cpp

--- 1.21/mysql-test/t/rpl_temporary.test	2006-05-14 20:32:23 +03:00
+++ 1.22/mysql-test/t/rpl_temporary.test	2006-05-16 19:33:18 +03:00
@@ -192,7 +192,7 @@
 #
 #14157: utf8 encoding in binlog without set character_set_client
 #
---exec $MYSQL --character-sets-dir=../sql/share/charsets/ --default-character-set=koi8r test -e 'create table t1 (a int); set names koi8r; create temporary table `ÑÝÉË` (a int); insert into `ÑÝÉË` values (1); insert into t1 select * from `ÑÝÉË`'
+--exec $MYSQL --character-sets-dir=../sql/share/charsets/ --default-character-set=latin1 test -e 'create table t1 (a int); set names latin1; create temporary table `äöüÄÖÜ` (a int); insert into `äöüÄÖÜ` values (1); insert into t1 select * from `äöüÄÖÜ`'
 
 sync_slave_with_master;
 #connection slave;