diff options
| author | unknown <igor@rurik.mysql.com> | 2003-06-30 09:53:04 -0700 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2003-06-30 09:53:04 -0700 |
| commit | dabe472203efe96b8688998ff1685492ed57261b (patch) | |
| tree | bc0fbb84e9c732cd6a72e75870455d59f00c5850 /sql/mysqld.cc | |
| parent | 0a1d7d64c85894fda6ff1f6342b167d22110dbf7 (diff) | |
| parent | 42817571dcb59e16f27cdf28843f26e45da893ee (diff) | |
| download | mariadb-git-dabe472203efe96b8688998ff1685492ed57261b.tar.gz | |
Merge rurik.mysql.com:/home/igor/mysql-4.1
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
myisam/mi_preload.c:
Auto merged
myisam/myisamchk.c:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 72ee3e30c63..9da15adcf68 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -874,7 +874,7 @@ void clean_up(bool print_message) udf_free(); #endif (void) ha_panic(HA_PANIC_CLOSE); /* close all tables and logs */ - end_key_cache(); + end_key_cache(&dflt_keycache,1); end_thr_alarm(1); /* Free allocated memory */ #ifdef USE_RAID end_raid(); |