From: kevin.lewis
Date: February 16 2012 6:18pm
Subject: bzr push into mysql-trunk branch (kevin.lewis:3912 to 3913)
List-Archive: http://lists.mysql.com/commits/142909
Message-Id: <20120216181806.BC0F91E52762@dhcp-adc-twvpn-2-vpnpool-10-154-44-48.vpn.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3913 kevin.lewis@stripped	2012-02-16 [merge]
      Upmerge from mysql-5.5

    modified:
      storage/innobase/srv/srv0start.cc
 3912 kevin.lewis@stripped	2012-02-16
      Refactor fil_space_t::name so that instead of holding a path, it holds
      a table name in the form database/tablename.  This is required in order
      for fil_space_t and fil_node_t to be able to track independently assigned
      tablespace names.
      
      This patch also contains some whitespace and comment cleanup.
      
      Approved by Inaam in rb:906

    modified:
      storage/innobase/dict/dict0boot.cc
      storage/innobase/dict/dict0load.cc
      storage/innobase/fil/fil0fil.cc
      storage/innobase/handler/i_s.cc
      storage/innobase/include/dict0boot.h
      storage/innobase/include/fil0fil.h
      storage/innobase/row/row0merge.cc
      storage/innobase/row/row0mysql.cc
      storage/innobase/row/row0sel.cc
=== modified file 'storage/innobase/srv/srv0start.cc'
--- a/storage/innobase/srv/srv0start.cc	revid:kevin.lewis@stripped
+++ b/storage/innobase/srv/srv0start.cc	revid:kevin.lewis@stripped
@@ -904,8 +904,9 @@ skip_size_check:
 #endif /* UNIV_LOG_ARCHIVE */
 				min_flushed_lsn, max_flushed_lsn);
 
-			if (UNIV_PAGE_SIZE
-			    != fsp_flags_get_page_size(flags)) {
+			if (!one_opened
+			    && UNIV_PAGE_SIZE
+			       != fsp_flags_get_page_size(flags)) {
 
 				ut_print_timestamp(stderr);
 				fprintf(stderr,

No bundle (reason: useless for push emails).