diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-06-05 02:06:51 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-06-05 02:06:51 +0200 |
| commit | f84f577aa15a193f24c3119eafdee554cb9775fb (patch) | |
| tree | ee531580839374516db09b2409ec4bd57a847e8a /storage/innobase/srv | |
| parent | f07b3463e7a4ff32316e1cc94d553b5009ac51f2 (diff) | |
| parent | 31c803e8d0543b330aa8e61ef878da43fe1f68f7 (diff) | |
| download | mariadb-git-f84f577aa15a193f24c3119eafdee554cb9775fb.tar.gz | |
Merge tag 'mysql-5.5.44' into bb-5.5-serg
Diffstat (limited to 'storage/innobase/srv')
| -rw-r--r-- | storage/innobase/srv/srv0start.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/innobase/srv/srv0start.c b/storage/innobase/srv/srv0start.c index ffe18c47e18..b9fd52aa833 100644 --- a/storage/innobase/srv/srv0start.c +++ b/storage/innobase/srv/srv0start.c @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved. +Copyright (c) 1996, 2015, Oracle and/or its affiliates. All rights reserved. Copyright (c) 2008, Google Inc. Copyright (c) 2009, Percona Inc. @@ -2240,9 +2240,9 @@ innobase_shutdown_for_mysql(void) ibuf_close(); log_shutdown(); - lock_sys_close(); trx_sys_file_format_close(); trx_sys_close(); + lock_sys_close(); mutex_free(&srv_monitor_file_mutex); mutex_free(&srv_dict_tmpfile_mutex); |