bzr commit into mysql-trunk-innodb branch (marko.makela:3566)

[marko.makela]

#At file:///home/marko/innobase/dev/mysql2a/5.6-innodb/ based on revid:marko.makela@stripped92ottl1bmys1

 3566 Marko Mäkelä	2011-04-06 [merge]
      Merge mysql-5.5-innodb to mysql-trunk-innodb.

    modified:
      storage/innobase/log/log0log.c
      storage/innobase/srv/srv0start.c
=== modified file 'storage/innobase/log/log0log.c'
--- a/storage/innobase/log/log0log.c	revid:marko.makela@strippedmys1
+++ b/storage/innobase/log/log0log.c	revid:marko.makela@stripped
@@ -3297,6 +3297,14 @@ loop:
 	log_archive_all();
 #endif /* UNIV_LOG_ARCHIVE */
 	if (srv_fast_shutdown == 2) {
+		ut_print_timestamp(stderr);
+		fprintf(stderr,
+			"  InnoDB: MySQL has requested a very fast shutdown"
+			" without flushing "
+			"the InnoDB buffer pool to data files."
+			" At the next mysqld startup "
+			"InnoDB will do a crash recovery!\n");
+
 		/* In this fastest shutdown we do not flush the buffer pool:
 		it is essentially a 'crash' of the InnoDB server. Make sure
 		that the log is all flushed to disk, so that we can recover

=== modified file 'storage/innobase/srv/srv0start.c'
--- a/storage/innobase/srv/srv0start.c	revid:marko.makela@stripped25-umeo92ottl1bmys1
+++ b/storage/innobase/srv/srv0start.c	revid:marko.makela@strippedkf83ah
@@ -2144,17 +2144,6 @@ innobase_shutdown_for_mysql(void)
 	The step 1 is the real InnoDB shutdown. The remaining steps 2 - ...
 	just free data structures after the shutdown. */
 
-
-	if (srv_fast_shutdown == 2) {
-		ut_print_timestamp(stderr);
-		fprintf(stderr,
-			"  InnoDB: MySQL has requested a very fast shutdown"
-			" without flushing "
-			"the InnoDB buffer pool to data files."
-			" At the next mysqld startup "
-			"InnoDB will do a crash recovery!\n");
-	}
-
 	logs_empty_and_mark_files_at_shutdown();
 
 	if (srv_conc_n_threads != 0) {

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