bk commit into 5.1 tree (tsmith:1.2589)

[tim]

Below is the list of changes that have just been committed into a local
5.1 repository of tsmith. When tsmith 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-08-28 10:17:15-06:00, tsmith@stripped +1 -0
  Fix another compiler warning on Windows in InnoDB.

  storage/innobase/handler/ha_innodb.cc@stripped, 2007-08-28 10:17:14-06:00,
tsmith@stripped +1 -1
    Fix compiler warning: ::get_auto_increment takes a ulonglong
    for nb_desired_values, but InnoDB's trx struct stores it as
    a ulint (unsigned long).  Probably harmless, as a single
    statement won't be asking for more than 2^32 rows.

diff -Nrup a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
--- a/storage/innobase/handler/ha_innodb.cc	2007-08-27 18:18:13 -06:00
+++ b/storage/innobase/handler/ha_innodb.cc	2007-08-28 10:17:14 -06:00
@@ -7324,7 +7324,7 @@ ha_innobase::get_auto_increment(
 		/* Called for the first time ? */
 		if (prebuilt->trx->n_autoinc_rows == 0) {
 
-			prebuilt->trx->n_autoinc_rows = nb_desired_values;
+			prebuilt->trx->n_autoinc_rows = (ulint) nb_desired_values;
 
 			/* It's possible for nb_desired_values to be 0:
 			e.g., INSERT INTO T1(C) SELECT C FROM T2; */