Commit d5037e54 authored by unknown's avatar unknown

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:
  innobase_shutdown_for_mysql(): Do very fast shutdown
  only if srv_fast_shutdown==2, not if srv_fast_shutdown!=0
  (Bug #9673)
parent 5f55424c
...@@ -1736,7 +1736,7 @@ innobase_shutdown_for_mysql(void) ...@@ -1736,7 +1736,7 @@ innobase_shutdown_for_mysql(void)
" InnoDB: MySQL has requested a very fast shutdown without flushing " " InnoDB: MySQL has requested a very fast shutdown without flushing "
"the InnoDB buffer pool to data files. At the next mysqld startup " "the InnoDB buffer pool to data files. At the next mysqld startup "
"InnoDB will do a crash recovery!\n"); "InnoDB will do a crash recovery!\n");
} }
#ifdef __NETWARE__ #ifdef __NETWARE__
if(!panic_shutdown) if(!panic_shutdown)
...@@ -1758,8 +1758,9 @@ innobase_shutdown_for_mysql(void) ...@@ -1758,8 +1758,9 @@ innobase_shutdown_for_mysql(void)
to die; all which counts is that we flushed the log; a 'very fast' to die; all which counts is that we flushed the log; a 'very fast'
shutdown is essentially a crash. */ shutdown is essentially a crash. */
if (srv_fast_shutdown) if (srv_fast_shutdown == 2) {
return((int) DB_SUCCESS); return(DB_SUCCESS);
}
/* All threads end up waiting for certain events. Put those events /* All threads end up waiting for certain events. Put those events
to the signaled state. Then the threads will exit themselves in to the signaled state. Then the threads will exit themselves in
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment