diff options
| author | unknown <marko@hundin.mysql.fi> | 2005-05-25 12:41:57 +0300 |
|---|---|---|
| committer | unknown <marko@hundin.mysql.fi> | 2005-05-25 12:41:57 +0300 |
| commit | d9d47c6a6f8eb99735450a8f06d014e7efd705e9 (patch) | |
| tree | 4b1a32381b19883589478af39e037097cab2ccf7 /innobase | |
| parent | 9ae4241994817853a514970b2e05293fba63c851 (diff) | |
| download | mariadb-git-d9d47c6a6f8eb99735450a8f06d014e7efd705e9.tar.gz | |
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)
Diffstat (limited to 'innobase')
| -rw-r--r-- | innobase/srv/srv0start.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/innobase/srv/srv0start.c b/innobase/srv/srv0start.c index e136aee43e8..541b73b831d 100644 --- a/innobase/srv/srv0start.c +++ b/innobase/srv/srv0start.c @@ -1736,7 +1736,7 @@ innobase_shutdown_for_mysql(void) " 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 @@ innobase_shutdown_for_mysql(void) 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 |