diff options
| author | unknown <guilhem@gbichot4.local> | 2007-08-29 17:53:54 +0200 |
|---|---|---|
| committer | unknown <guilhem@gbichot4.local> | 2007-08-29 17:53:54 +0200 |
| commit | b113fe7406413433bdaabbf92b1eeb051da82fce (patch) | |
| tree | c7d9c18ce28970536a20d0aee5bbd95f632dcb54 /sql | |
| parent | 4201d2784945da87c4274eae1a5ea1b79f34ab12 (diff) | |
| parent | e27890cab0a9155b38df57748af9d20dfcccb590 (diff) | |
| download | mariadb-git-b113fe7406413433bdaabbf92b1eeb051da82fce.tar.gz | |
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-maria
into gbichot4.local:/home/mysql_src/mysql-maria-for-undo-phase
storage/maria/ha_maria.cc:
Auto merged
storage/maria/ma_blockrec.c:
Auto merged
storage/maria/ma_loghandler.c:
Auto merged
storage/maria/ma_loghandler.h:
Auto merged
storage/maria/ma_loghandler_lsn.h:
Auto merged
storage/maria/maria_chk.c:
Auto merged
storage/maria/maria_read_log.c:
Auto merged
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/mysqld.cc | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index dec25215acc..4b403fd85b6 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -3418,6 +3418,17 @@ server."); using_update_log=1; } + /* call ha_init_key_cache() on all key caches to init them */ + process_key_caches(&ha_init_key_cache); + /* + Maria's pagecache needs to be ready before Maria engine (Recovery uses + pagecache, and Checkpoint may happen at startup). Maria engine is taken up + in plugin_init(). + */ +#ifdef WITH_MARIA_STORAGE_ENGINE + process_pagecaches(&ha_init_pagecache); +#endif /* WITH_MARIA_STORAGE_ENGINE */ + /* Allow storage engine to give real error messages */ if (ha_init_errors()) DBUG_RETURN(1); @@ -3588,12 +3599,6 @@ server."); if (opt_myisam_log) (void) mi_log(1); - /* call ha_init_key_cache() on all key caches to init them */ - process_key_caches(&ha_init_key_cache); -#ifdef WITH_MARIA_STORAGE_ENGINE - process_pagecaches(&ha_init_pagecache); -#endif /* WITH_MARIA_STORAGE_ENGINE */ - #if defined(HAVE_MLOCKALL) && defined(MCL_CURRENT) && !defined(EMBEDDED_LIBRARY) if (locked_in_memory && !getuid()) { |