diff options
| author | unknown <guilhem@gbichot4.local> | 2007-07-26 12:15:47 +0200 |
|---|---|---|
| committer | unknown <guilhem@gbichot4.local> | 2007-07-26 12:15:47 +0200 |
| commit | 79f7cb4e95b18bb2bc5db590532dc0fc6757ebdb (patch) | |
| tree | 05e4d0da2d9825b9bdaf6da3945d6dff441420cf /sql | |
| parent | 85510db991b5bbaa954bd181e1d02e45ca9f845f (diff) | |
| parent | 6bbca54d7dfa5cc3f5a6da46395b73f77d142527 (diff) | |
| download | mariadb-git-79f7cb4e95b18bb2bc5db590532dc0fc6757ebdb.tar.gz | |
merge
sql/handler.cc:
Auto merged
storage/maria/ha_maria.cc:
Auto merged
storage/maria/ma_blockrec.c:
Auto merged
storage/maria/ma_close.c:
Auto merged
storage/maria/ma_create.c:
Auto merged
storage/maria/ma_loghandler.c:
Auto merged
storage/maria/ma_loghandler.h:
Auto merged
storage/maria/ma_test2.c:
Auto merged
storage/maria/maria_read_log.c:
will merge by hand
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/handler.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index cbe32dd4529..4b1938fe569 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -2808,7 +2808,7 @@ int ha_change_key_cache(KEY_CACHE *old_key_cache, int ha_init_pagecache(const char *name, PAGECACHE *pagecache) { - DBUG_ENTER("ha_init_key_cache"); + DBUG_ENTER("ha_init_pagecache"); if (!pagecache->inited) { |