bk commit into 5.0 tree (mskold:1.2492)

[Martin Skold]

Below is the list of changes that have just been committed into a local
5.0 repository of marty. When marty 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-11-06 10:28:11+01:00, mskold@stripped +1 -0
  Removed compiler warnings

  sql/ha_ndbcluster.cc@stripped, 2007-11-06 10:28:04+01:00, mskold@stripped +6 -7
    Removed compiler warnings

# 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:	mskold
# Host:	quadfish.(none)
# Root:	/home/marty/MySQL/mysql-5.0-ndb

--- 1.321/sql/ha_ndbcluster.cc	2007-11-05 18:11:55 +01:00
+++ 1.322/sql/ha_ndbcluster.cc	2007-11-06 10:28:04 +01:00
@@ -4901,7 +4901,7 @@
 
 ulonglong ha_ndbcluster::get_auto_increment()
 {  
-  int cache_size;
+  uint cache_size;
   Uint64 auto_value;
   THD *thd= current_thd;
   Uint64 step= thd->variables.auto_increment_increment;
@@ -4915,15 +4915,14 @@
     /* We guessed too low */
     m_rows_to_insert+= m_autoincrement_prefetch;
   }
-  int remaining= m_rows_to_insert - m_rows_inserted;
-  int min_prefetch= 
+  uint remaining= m_rows_to_insert - m_rows_inserted;
+  uint min_prefetch= 
     (remaining < thd->variables.ndb_autoincrement_prefetch_sz) ?
     thd->variables.ndb_autoincrement_prefetch_sz
     : remaining;
-  cache_size= 
-    (int) ((remaining < m_autoincrement_prefetch) ?
-           min_prefetch
-	   : remaining);
+  cache_size= ((remaining < m_autoincrement_prefetch) ?
+	       min_prefetch
+	       : remaining);
   uint retries= NDB_AUTO_INCREMENT_RETRIES;
   int retry_sleep= 30; /* 30 milliseconds, transaction */
   for (;;)