bzr push into mysql-trunk-innodb branch (vasil.dimov:3536 to 3537)

[vasil.dimov]

 3537 Vasil Dimov	2011-03-14
      Fix compilation warning on Windows:
      
      1>.\buf\buf0flu.c(2326) : warning C4244: 'initializing' : conversion 
      from 'ib_uint64_t' to 'ulint', possible loss of data
      
      Spotted by:	Calvin

    modified:
      storage/innobase/buf/buf0flu.c
 3536 Vasil Dimov	2011-03-14
      Set the max len of innodb stats columns to the actual limit
      
      The max len for database/table/index name is 64 characters and is
      defined in mysql_com.h:
      #define NAME_CHAR_LEN   64              /* Field/table name length */
      
      This change fixes loading the persistent_storage.sql script and syncs it
      with innodb_stats_bootstrap.inc
      
      Spotted by:	Michael

    modified:
      mysql-test/suite/innodb/include/innodb_stats_bootstrap.inc
      storage/innobase/scripts/persistent_storage.sql
=== modified file 'storage/innobase/buf/buf0flu.c'
--- a/storage/innobase/buf/buf0flu.c	revid:vasil.dimov@stripped
+++ b/storage/innobase/buf/buf0flu.c	revid:vasil.dimov@stripped
@@ -2164,7 +2164,7 @@ it can cause IO bursts of flushing. This
 to avoid this burstiness.
 @return	number of dirty pages to be flushed / second */
 static
-ib_uint64_t
+ulint
 buf_flush_get_desired_flush_rate(void)
 /*==================================*/
 {
@@ -2226,7 +2226,7 @@ buf_flush_get_desired_flush_rate(void)
 
 		rate = n_flush_req - lru_flush_avg;
 
-		return(rate < PCT_IO(100) ? rate : PCT_IO(100));
+		return((ulint) (rate < PCT_IO(100) ? rate : PCT_IO(100)));
 	}
 }
 

No bundle (reason: useless for push emails).