branches/zip: Merge revision 4359 from branches/5.1:

  ------------------------------------------------------------------------
  r4359 | vasil | 2009-03-05 21:42:01 +0200 (Thu, 05 Mar 2009) | 14 lines
  Changed paths:
     M /branches/5.1/handler/ha_innodb.cc
  
  branches/5.1:
  
  Merge a change from MySQL:
  
    ------------------------------------------------------------
    revno: 2747
    committer: Timothy Smith <timothy.smith@sun.com>
    branch nick: 51
    timestamp: Fri 2009-01-16 17:49:07 +0100
    message:
      Add another cast to ignore int/ulong difference in error types, silence warning on Win64
    modified:
      storage/innobase/handler/ha_innodb.cc
  
  ------------------------------------------------------------------------

handler/ha_innodb.cc

@@ -4224,7 +4224,7 @@ no_commit:
 
 			/* We don't want to mask autoinc overflow errors. */
 			if (prebuilt->autoinc_error != DB_SUCCESS) {
-				error = prebuilt->autoinc_error;
+				error = (int) prebuilt->autoinc_error;
 
 				goto report_error;
 			}