bk commit into 5.1 tree (pekka:1.2190)

[pekka]

Below is the list of changes that have just been committed into a local
5.1 repository of pekka. When pekka 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.2190 06/05/25 20:00:36 pekka@stripped +1 -0
  ndb - compile fix for Solaris 10 AMD64 -max GCC [ ulonglong != Uint64 ] v5.1

  sql/ha_ndbcluster.cc
    1.309 06/05/25 19:57:52 pekka@stripped +4 -1
    compile fix for Solaris 10 AMD64 -max GCC [ ulonglong != Uint64 ]

# 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:	pekka
# Host:	orca.ndb.mysql.com
# Root:	/space/pekka/ndb/version/my51

--- 1.308/sql/ha_ndbcluster.cc	2006-05-25 13:48:52 +02:00
+++ 1.309/sql/ha_ndbcluster.cc	2006-05-25 19:57:52 +02:00
@@ -3546,14 +3546,17 @@
       Ndb *ndb= get_ndb();
       Ndb_tuple_id_range_guard g(m_share);
       
+      Uint64 auto_increment_value64;
       if (ndb->readAutoIncrementValue(m_table, g.range,
-                                      auto_increment_value) == -1)
+                                      auto_increment_value64) == -1)
       {
         const NdbError err= ndb->getNdbError();
         sql_print_error("Error %lu in readAutoIncrementValue(): %s",
                         (ulong) err.code, err.message);
         auto_increment_value= ~(Uint64)0;
       }
+      else
+        auto_increment_value= (ulonglong)auto_increment_value64;
     }
   }
   DBUG_VOID_RETURN;