bzr push into mysql-5.5-innodb branch (marko.makela:3360 to 3361)

[marko.makela]

 3361 Marko Mäkelä	2011-04-06
      Non-functional change: move a printout
      from innobase_shutdown_for_mysql() to
      logs_empty_and_mark_files_at_shutdown()
      where the rest of the logic is located.

    modified:
      storage/innobase/log/log0log.c
      storage/innobase/srv/srv0start.c
 3360 Marko Mäkelä	2011-04-06
      Enable __attribute__((cold)) only for GCC 4.3 and later.
      This attribute was introduced in bzr revision-id
      marko.makela@stripped0i
      and caused older GCC versions to emit warnings.

    modified:
      storage/innobase/include/os0thread.h
      storage/innobase/include/univ.i
      storage/innobase/include/ut0dbg.h
      storage/innobase/include/ut0ut.h
=== modified file 'storage/innobase/log/log0log.c'
--- a/storage/innobase/log/log0log.c	revid:[e-mail]-20110406062236-y11o0ddrwgxnvw8i
+++ b/storage/innobase/log/log0log.c	revid:marko.makela@stripped6073449-7m4oxs8rtbpxgz31
@@ -3137,6 +3137,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,

=== modified file 'storage/innobase/srv/srv0start.c'
--- a/storage/innobase/srv/srv0start.c	revid:marko.makela@stripped20110406062236-y11o0ddrwgxnvw8i
+++ b/storage/innobase/srv/srv0start.c	revid:marko.makela@stripped9-7m4oxs8rtbpxgz31
@@ -2097,17 +2097,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]