bk commit into 5.1 tree (tomas:1.2501)

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas 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@stripped, 2007-03-26 21:11:58+02:00, tomas@stripped +15 -0
  Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
  into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco
  MERGE: 1.2494.1.27

  sql/ha_ndbcluster.cc@stripped, 2007-03-26 21:11:53+02:00, tomas@stripped +0
-0
    Auto merged
    MERGE: 1.408.1.14

  storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp@stripped, 2007-03-26 21:11:53+02:00,
tomas@stripped +0 -0
    Auto merged
    MERGE: 1.24.1.11

  storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@stripped, 2007-03-26 21:11:53+02:00,
tomas@stripped +0 -0
    Auto merged
    MERGE: 1.96.1.22

  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@stripped, 2007-03-26 21:11:53+02:00,
tomas@stripped +0 -0
    Auto merged
    MERGE: 1.129.1.18

  storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp@stripped, 2007-03-26 21:11:53+02:00,
tomas@stripped +0 -0
    Auto merged
    MERGE: 1.47.1.10

  storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp@stripped, 2007-03-26 21:11:53+02:00,
tomas@stripped +0 -0
    Auto merged
    MERGE: 1.131.1.16

  storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp@stripped, 2007-03-26 21:11:53+02:00,
tomas@stripped +0 -0
    Auto merged
    MERGE: 1.50.1.6

  storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp@stripped, 2007-03-26 21:11:53+02:00,
tomas@stripped +0 -0
    Auto merged
    MERGE: 1.35.1.5

  storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp@stripped, 2007-03-26 21:11:53+02:00,
tomas@stripped +0 -0
    Auto merged
    MERGE: 1.41.1.13

  storage/ndb/src/mgmsrv/ConfigInfo.cpp@stripped, 2007-03-26 21:11:54+02:00,
tomas@stripped +0 -0
    Auto merged
    MERGE: 1.94.1.11

  storage/ndb/src/ndbapi/NdbRecAttr.cpp@stripped, 2007-03-26 21:11:54+02:00,
tomas@stripped +0 -0
    Auto merged
    MERGE: 1.33.1.6

  storage/ndb/test/ndbapi/testNodeRestart.cpp@stripped, 2007-03-26 21:11:54+02:00,
tomas@stripped +0 -0
    Auto merged
    MERGE: 1.36.1.17

  storage/ndb/test/run-test/daily-basic-tests.txt@stripped, 2007-03-26 21:11:54+02:00,
tomas@stripped +0 -0
    Auto merged
    MERGE: 1.61.1.15

  storage/ndb/test/src/UtilTransactions.cpp@stripped, 2007-03-26 21:11:54+02:00,
tomas@stripped +0 -0
    Auto merged
    MERGE: 1.27.1.2

  storage/ndb/tools/restore/Restore.cpp@stripped, 2007-03-26 21:11:54+02:00,
tomas@stripped +0 -0
    Auto merged
    MERGE: 1.45.1.5

# 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:	tomas
# Host:	whalegate.ndb.mysql.com
# Root:	/home/tomas/mysql-5.1-telco/RESYNC

--- 1.43/storage/ndb/src/ndbapi/NdbRecAttr.cpp	2007-03-23 17:13:21 +01:00
+++ 1.44/storage/ndb/src/ndbapi/NdbRecAttr.cpp	2007-03-26 21:11:54 +02:00
@@ -234,24 +234,13 @@
       break;
     case NdbDictionary::Column::Bit:
       out << f.hex_prefix << "0x";
-      if (length < 33)
       {
-        out.print("%X", r.u_32_value());
-      }
-      else if (length < 65)
-      {
-        out.print("%llX", r.u_64_value());
-      }
-      else
-      {
-        const unsigned char *buf = (unsigned char *)r.aRef();
-        int k = 4*((length+31)/32);
-        while (k > 0 && (*(buf + --k) == 0));
-        do
-        {
-          out.print("%X", (Uint32)*(buf + k--));
-        }
-        while (k >= 0);
+        const Uint32 *buf = (Uint32 *)r.aRef();
+        int k = (length+31)/32;
+        while (k > 0 && (buf[--k] == 0));
+        out.print("%X", buf[k]);
+        while (k > 0)
+          out.print("%.8X", buf[--k]);
       }
       break;
     case NdbDictionary::Column::Unsigned:

--- 1.430/sql/ha_ndbcluster.cc	2007-03-23 17:13:20 +01:00
+++ 1.431/sql/ha_ndbcluster.cc	2007-03-26 21:11:53 +02:00
@@ -740,10 +740,9 @@
         DBUG_PRINT("info", ("bit field"));
         DBUG_DUMP("value", (char*)&bits, pack_len);
 #ifdef WORDS_BIGENDIAN
-        if (pack_len < 5)
-        {
-          DBUG_RETURN(ndb_op->setValue(fieldnr, ((char*)&bits)+4) != 0);
-        }
+        /* store lsw first */
+        bits = ((bits >> 32) & 0x00000000FFFFFFFF)
+          |    ((bits << 32) & 0xFFFFFFFF00000000);
 #endif
         DBUG_RETURN(ndb_op->setValue(fieldnr, (char*)&bits) != 0);
       }
@@ -3162,10 +3161,21 @@
           else
           {
             DBUG_PRINT("info", ("bit field H'%.8X%.8X",
-                                *(Uint32*) (*value).rec->aRef(),
-                                *((Uint32*) (*value).rec->aRef()+1)));
-            field_bit->Field_bit::store((longlong) (*value).rec->u_64_value(), 
+                                *(Uint32 *)(*value).rec->aRef(),
+                                *((Uint32 *)(*value).rec->aRef()+1)));
+#ifdef WORDS_BIGENDIAN
+            /* lsw is stored first */
+            Uint32 *buf= (Uint32 *)(*value).rec->aRef();
+            field_bit->Field_bit::store((((longlong)*buf)
+                                         & 0x000000000FFFFFFFF)
+                                        |
+                                        ((((longlong)*(buf+1)) << 32)
+                                         & 0xFFFFFFFF00000000),
                                         TRUE);
+#else
+            field_bit->Field_bit::store((longlong)
+                                        (*value).rec->u_64_value(), TRUE);
+#endif
           }
           /*
             Move back internal field pointer to point to original