Merge mysql.com:/usr_rh9/home/elkin.rh9/4.1

into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0


mysql-test/t/rpl_temporary.test:
  Auto merged
ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Auto merged
ndb/test/ndbapi/Makefile.am:
  Auto merged

mysql-test/t/rpl_temporary.test

@@ -192,7 +192,7 @@ drop table t1;
 #
 #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;

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

@@ -1496,6 +1496,7 @@ int Dbtup::interpreterNextLab(Signal* signal,
 	    // 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 @@ int Dbtup::interpreterNextLab(Signal* signal,
 	  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

ndb/test/ndbapi/Makefile.am

@@ -24,6 +24,7 @@ testOIBasic \
 testOperations \
 testRestartGci \
 testScan \
+testInterpreter \
 testScanInterpreter \
 testScanPerf \
 testSystemRestart \
@@ -65,6 +66,7 @@ testOIBasic_SOURCES = testOIBasic.cpp
 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

ndb/test/ndbapi/testInterpreter.cpp

@@ -79,46 +79,46 @@ int runTestIncValue32(NDBT_Context* ctx, NDBT_Step* step){
   Ndb* pNdb = GETNDB(step);
 
 
- NdbConnection* pTrans = pNdb->startTransaction();
- if (pTrans == NULL){
-   ERR(pNdb->getNdbError());
-   return NDBT_FAILED;
- }
- 
- NdbOperation* pOp = pTrans->getNdbOperation(pTab->getName());
- if (pOp == NULL) {
-   ERR(pTrans->getNdbError());
-   pNdb->closeTransaction(pTrans);
-   return NDBT_FAILED;
- }
- 
- int check = pOp->interpretedUpdateTuple();
- if( check == -1 ) {
-   ERR(pTrans->getNdbError());
-   pNdb->closeTransaction(pTrans);
-   return NDBT_FAILED;
- }
-
-
- // Primary keys
- Uint32 pkVal = 1;
- check = pOp->equal("KOL1", pkVal );
- if( check == -1 ) {
-   ERR(pTrans->getNdbError());
-   pNdb->closeTransaction(pTrans);
-   return NDBT_FAILED;
- }
-
- // Attributes
-
- // Update column
- Uint32 valToIncWith = 1;
- check = pOp->incValue("KOL2", valToIncWith);
- if( check == -1 ) {
-   ERR(pTrans->getNdbError());
-   pNdb->closeTransaction(pTrans);
-   return NDBT_FAILED;
- }
+  NdbConnection* pTrans = pNdb->startTransaction();
+  if (pTrans == NULL){
+    ERR(pNdb->getNdbError());
+    return NDBT_FAILED;
+  }
+  
+  NdbOperation* pOp = pTrans->getNdbOperation(pTab->getName());
+  if (pOp == NULL) {
+    ERR(pTrans->getNdbError());
+    pNdb->closeTransaction(pTrans);
+    return NDBT_FAILED;
+  }
+  
+  int check = pOp->interpretedUpdateTuple();
+  if( check == -1 ) {
+    ERR(pTrans->getNdbError());
+    pNdb->closeTransaction(pTrans);
+    return NDBT_FAILED;
+  }
+  
+  
+  // Primary keys
+  Uint32 pkVal = 1;
+  check = pOp->equal("KOL1", pkVal );
+  if( check == -1 ) {
+    ERR(pTrans->getNdbError());
+    pNdb->closeTransaction(pTrans);
+    return NDBT_FAILED;
+  }
+  
+  // Attributes
+  
+  // Update column
+  Uint32 valToIncWith = 1;
+  check = pOp->incValue("KOL2", valToIncWith);
+  if( check == -1 ) {
+    ERR(pTrans->getNdbError());
+    pNdb->closeTransaction(pTrans);
+    return NDBT_FAILED;
+  }
 
   NdbRecAttr* valueRec = pOp->getValue("KOL2");
   if( valueRec == NULL ) {
@@ -142,6 +142,122 @@ int runTestIncValue32(NDBT_Context* ctx, NDBT_Step* step){
   return NDBT_OK;
 }
 
+int runTestBug19537(NDBT_Context* ctx, NDBT_Step* step){
+  int result = NDBT_OK;
+  const NdbDictionary::Table * pTab = ctx->getTab();
+  Ndb* pNdb = GETNDB(step);
+
+  if (strcmp(pTab->getName(), "T1") != 0) {
+    g_err << "runTestBug19537: skip, table != T1" << endl;
+    return NDBT_OK;
+  }
+
+
+  NdbConnection* pTrans = pNdb->startTransaction();
+  if (pTrans == NULL){
+    ERR(pNdb->getNdbError());
+    return NDBT_FAILED;
+  }
+  
+  NdbOperation* pOp = pTrans->getNdbOperation(pTab->getName());
+  if (pOp == NULL) {
+    ERR(pTrans->getNdbError());
+    pNdb->closeTransaction(pTrans);
+    return NDBT_FAILED;
+  }
+  
+  if (pOp->interpretedUpdateTuple() == -1) {
+    ERR(pOp->getNdbError());
+    pNdb->closeTransaction(pTrans);
+    return NDBT_FAILED;
+  }
+  
+  
+  // Primary keys
+  const Uint32 pkVal = 1;
+  if (pOp->equal("KOL1", pkVal) == -1) {
+    ERR(pTrans->getNdbError());
+    pNdb->closeTransaction(pTrans);
+    return NDBT_FAILED;
+  }
+  
+  // Load 64-bit constant into register 1 and
+  // write from register 1 to 32-bit column KOL2
+  const Uint64 reg_val = 0x0102030405060708ULL;
+
+  const Uint32* reg_ptr32 = (const Uint32*)&reg_val;
+  if (reg_ptr32[0] == 0x05060708 && reg_ptr32[1] == 0x01020304) {
+    g_err << "runTestBug19537: platform is LITTLE endian" << endl;
+  } else if (reg_ptr32[0] == 0x01020304 && reg_ptr32[1] == 0x05060708) {
+    g_err << "runTestBug19537: platform is BIG endian" << endl;
+  } else {
+    g_err << "runTestBug19537: impossible platform"
+          << hex << " [0]=" << reg_ptr32[0] << " [1]=" <<reg_ptr32[1] << endl;
+    pNdb->closeTransaction(pTrans);
+    return NDBT_FAILED;
+  }
+
+  if (pOp->load_const_u64(1, reg_val) == -1 ||
+      pOp->write_attr("KOL2", 1) == -1) {
+    ERR(pOp->getNdbError());
+    pNdb->closeTransaction(pTrans);
+    return NDBT_FAILED;
+  }
+
+  if (pTrans->execute(Commit) == -1) {
+    ERR(pTrans->getNdbError());
+    pNdb->closeTransaction(pTrans);
+    return NDBT_FAILED;
+  }
+
+  // Read value via a new transaction
+
+  pTrans = pNdb->startTransaction();
+  if (pTrans == NULL){
+    ERR(pNdb->getNdbError());
+    return NDBT_FAILED;
+  }
+  
+  pOp = pTrans->getNdbOperation(pTab->getName());
+  if (pOp == NULL) {
+    ERR(pTrans->getNdbError());
+    pNdb->closeTransaction(pTrans);
+    return NDBT_FAILED;
+  }
+  
+  Uint32 kol2 = 0x09090909;
+  if (pOp->readTuple() == -1 ||
+      pOp->equal("KOL1", pkVal) == -1 ||
+      pOp->getValue("KOL2", (char*)&kol2) == 0) {
+    ERR(pOp->getNdbError());
+    pNdb->closeTransaction(pTrans);
+    return NDBT_FAILED;
+  }
+
+  if (pTrans->execute(Commit) == -1) {
+    ERR(pTrans->getNdbError());
+    pNdb->closeTransaction(pTrans);
+    return NDBT_FAILED;
+  }
+
+  // Expected conversion as in C - truncate to lower (logical) word
+
+  if (kol2 == 0x01020304) {
+    g_err << "runTestBug19537: the bug manifests itself !" << endl;
+    pNdb->closeTransaction(pTrans);
+    return NDBT_FAILED;
+  }
+
+  if (kol2 != 0x05060708) {
+    g_err << "runTestBug19537: impossible KOL2 " << hex << kol2 << endl;
+    pNdb->closeTransaction(pTrans);
+    return NDBT_FAILED;
+  }
+
+  pNdb->closeTransaction(pTrans);
+  return NDBT_OK;
+}
+
 
 NDBT_TESTSUITE(testInterpreter);
 TESTCASE("IncValue32", 
@@ -156,6 +272,12 @@ TESTCASE("IncValue64",
   INITIALIZER(runTestIncValue64);
   FINALIZER(runClearTable);
 }
+TESTCASE("Bug19537",
+         "Test big-endian write_attr of 32 bit integer\n"){
+  INITIALIZER(runLoadTable);
+  INITIALIZER(runTestBug19537);
+  FINALIZER(runClearTable);
+}
 #if 0
 TESTCASE("MaxTransactions", 
 	 "Start transactions until no more can be created\n"){