bzr push into mysql-trunk branch (marko.makela:3114 to 3115)

[marko.makela]

 3115 Marko Mäkelä	2011-05-26
      InnoDB: Fix a compiler warning.
      
      open_or_create_data_files(): Truncate the number of pages to ulint.
      The InnoDB page number is 32 bits. This limits the tablespace file size
      to 1<<(32+UNIV_PAGE_SIZE_SHIFT) bytes, or 64 terabytes.

    modified:
      storage/innobase/srv/srv0start.c
 3114 Dmitry Shulga	2011-05-25 [merge]
      Merge mysql-5.5->mysql-trunk for follow-up for bug#11749345.

    modified:
      sql/sql_show.cc
=== modified file 'storage/innobase/srv/srv0start.c'
--- a/storage/innobase/srv/srv0start.c	revid:dmitry.shulga@stripped71zhjn7nj07jn7g
+++ b/storage/innobase/srv/srv0start.c	revid:marko.makela@strippedby
@@ -840,7 +840,8 @@ open_or_create_data_files(
 			ut_a(size != (os_offset_t) -1);
 			/* Round size downward to megabytes */
 
-			rounded_size_pages = size >> UNIV_PAGE_SIZE_SHIFT;
+			rounded_size_pages = (ulint)
+				(size >> UNIV_PAGE_SIZE_SHIFT);
 
 			if (i == srv_n_data_files - 1
 			    && srv_auto_extend_last_data_file) {

Attachment: [text/bzr-bundle] bzr/[e-mail]