bk commit into 5.0 tree (marko:1.1910) BUG#9673

[Marko Mäkelä]

Below is the list of changes that have just been committed into a local
5.0 repository of marko. When marko does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1910 05/05/25 12:41:57 marko@stripped +1 -0
  srv0start.c:
    innobase_shutdown_for_mysql(): Do very fast shutdown
    only if srv_fast_shutdown==2, not if srv_fast_shutdown!=0
    (Bug #9673)

  innobase/srv/srv0start.c
    1.81 05/05/25 12:40:15 marko@stripped +4 -3
    innobase_shutdown_for_mysql(): Do very fast shutdown
    only if srv_fast_shutdown==2, not if srv_fast_shutdown!=0
    (Bug #9673)

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	marko
# Host:	hundin.mysql.fi
# Root:	/home/marko/mysql-5.0.4

--- 1.80/innobase/srv/srv0start.c	Fri Apr 15 19:00:27 2005
+++ 1.81/innobase/srv/srv0start.c	Wed May 25 12:40:15 2005
@@ -1736,7 +1736,7 @@
 "  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");
-	  	}
+	}
 
 #ifdef __NETWARE__
 	if(!panic_shutdown)
@@ -1758,8 +1758,9 @@
         to die; all which counts is that we flushed the log; a 'very fast'
         shutdown is essentially a crash. */
 
-        if (srv_fast_shutdown)
-          return((int) DB_SUCCESS);
+	if (srv_fast_shutdown == 2) {
+		return(DB_SUCCESS);
+	}
 
 	/* All threads end up waiting for certain events. Put those events
 	to the signaled state. Then the threads will exit themselves in