bk commit into 5.1 tree (tsmith:1.2606)

[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-11-07 12:59:22-07:00, tsmith@stripped +1 -0
  Cast away compiler warning on Windows.

  storage/innobase/handler/ha_innodb.cc@stripped, 2007-11-07 12:59:20-07:00, tsmith@stripped +1 -1
    Cast away a compiler warning; some functions return ulong or ulint for
    errors, and some use int.  Let's hope these all fit in an int.

diff -Nrup a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
--- a/storage/innobase/handler/ha_innodb.cc	2007-11-06 16:33:49 -07:00
+++ b/storage/innobase/handler/ha_innodb.cc	2007-11-07 12:59:20 -07:00
@@ -3538,7 +3538,7 @@ set_max_autoinc:
 				err = innobase_set_max_autoinc(auto_inc);
 
 				if (err != DB_SUCCESS) {
-					error = err;
+					error = (int) err;
 				}
 			}
 			break;