diff options
| author | gbichot@production.mysql.com <> | 2005-03-22 00:26:12 +0100 |
|---|---|---|
| committer | gbichot@production.mysql.com <> | 2005-03-22 00:26:12 +0100 |
| commit | c766efdc5db3f54650f9202225a82db715e75e6f (patch) | |
| tree | a68553da2993095e4192c9deed704a0dc63b5e8b /sql/ha_innodb.cc | |
| parent | 371850a4596cea70a250a97b5a70c5c2425f1de0 (diff) | |
| download | mariadb-git-c766efdc5db3f54650f9202225a82db715e75e6f.tar.gz | |
Last part of WL#1062: better replication of timezones: no more use
of SET ONE_SHOT; storing tz info directly in event (if this info is needed),
it's now allowed to have different global tz on master and slave.
Diffstat (limited to 'sql/ha_innodb.cc')
| -rw-r--r-- | sql/ha_innodb.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc index 870ad1af52b..24f1579544b 100644 --- a/sql/ha_innodb.cc +++ b/sql/ha_innodb.cc @@ -1307,6 +1307,9 @@ innobase_end(void) } #endif if (innodb_inited) { + +#ifndef __NETWARE__ /* NetWare can't close unclosed files, kill remaining + threads, etc, so we disable the very fast shutdown */ if (innobase_very_fast_shutdown) { srv_very_fast_shutdown = TRUE; fprintf(stderr, @@ -1314,6 +1317,7 @@ innobase_end(void) "InnoDB: the InnoDB buffer pool to data files. At the next mysqld startup\n" "InnoDB: InnoDB will do a crash recovery!\n"); } +#endif innodb_inited = 0; if (innobase_shutdown_for_mysql() != DB_SUCCESS) { |