List:Commits« Previous MessageNext Message »
From:Joerg Bruehe Date:April 18 2007 3:50pm
Subject:bk commit into 5.0 tree (joerg:1.2463)
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 repository of joerg. When joerg 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-04-18 15:50:49+02:00, joerg@trift2. +1 -0
  sql/ha_ndbcluster.cc
      Hex constants that exceed 32 bit need to be marked "LL" for the compile to work.

  sql/ha_ndbcluster.cc@stripped, 2007-04-18 15:50:46+02:00, joerg@trift2. +4 -4
    Hex constants that exceed 32 bit need to be marked "LL" for the compile to work.

# 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:	joerg
# Host:	trift2.
# Root:	/MySQL/M50/clone-5.0

--- 1.309/sql/ha_ndbcluster.cc	2007-04-12 11:07:28 +02:00
+++ 1.310/sql/ha_ndbcluster.cc	2007-04-18 15:50:46 +02:00
@@ -733,8 +733,8 @@
         DBUG_DUMP("value", (char*)&bits, pack_len);
 #ifdef WORDS_BIGENDIAN
         /* store lsw first */
-        bits = ((bits >> 32) & 0x00000000FFFFFFFF)
-          |    ((bits << 32) & 0xFFFFFFFF00000000);
+        bits = ((bits >> 32) & 0x00000000FFFFFFFFLL)
+          |    ((bits << 32) & 0xFFFFFFFF00000000LL);
 #endif
         DBUG_RETURN(ndb_op->setValue(fieldnr, (char*)&bits, pack_len) != 0);
       }
@@ -2678,10 +2678,10 @@
             /* lsw is stored first */
             Uint32 *buf= (Uint32 *)(*value).rec->aRef();
             ((Field_bit *) *field)->store((((longlong)*buf)
-                                           & 0x000000000FFFFFFFF)
+                                           & 0x000000000FFFFFFFFLL)
                                           |
                                           ((((longlong)*(buf+1)) << 32)
-                                           & 0xFFFFFFFF00000000),
+                                           & 0xFFFFFFFF00000000LL),
                                           TRUE);
 #else
             ((Field_bit *) *field)->store((longlong)
Thread
bk commit into 5.0 tree (joerg:1.2463)Joerg Bruehe18 Apr