diff options
| author | unknown <heikki@hundin.mysql.fi> | 2002-08-02 23:16:19 +0300 |
|---|---|---|
| committer | unknown <heikki@hundin.mysql.fi> | 2002-08-02 23:16:19 +0300 |
| commit | e41206a55693d22ef9b7b6760b8ff921e30111cd (patch) | |
| tree | 79d62af7e6f5f927672de74cbb469640fe4ff3bd /innobase/ha | |
| parent | 3884935df646aa82438e02172304c969de20dbbc (diff) | |
| download | mariadb-git-e41206a55693d22ef9b7b6760b8ff921e30111cd.tar.gz | |
Many files:
Merge InnoDB-3.23.52c
ha_innobase.cc:
Test the ref length sanity also in the production version
sql/ha_innobase.cc:
Test the ref length sanity also in the production version
innobase/btr/btr0cur.c:
Merge InnoDB-3.23.52c
innobase/buf/buf0buf.c:
Merge InnoDB-3.23.52c
innobase/buf/buf0lru.c:
Merge InnoDB-3.23.52c
innobase/ha/ha0ha.c:
Merge InnoDB-3.23.52c
innobase/log/log0recv.c:
Merge InnoDB-3.23.52c
innobase/mtr/mtr0log.c:
Merge InnoDB-3.23.52c
innobase/os/os0file.c:
Merge InnoDB-3.23.52c
innobase/page/page0cur.c:
Merge InnoDB-3.23.52c
innobase/include/btr0btr.h:
Merge InnoDB-3.23.52c
innobase/include/dyn0dyn.h:
Merge InnoDB-3.23.52c
innobase/include/log0recv.h:
Merge InnoDB-3.23.52c
innobase/include/buf0buf.ic:
Merge InnoDB-3.23.52c
innobase/include/log0log.ic:
Merge InnoDB-3.23.52c
Diffstat (limited to 'innobase/ha')
| -rw-r--r-- | innobase/ha/ha0ha.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/innobase/ha/ha0ha.c b/innobase/ha/ha0ha.c index acde236bb2f..4489b25ec2b 100644 --- a/innobase/ha/ha0ha.c +++ b/innobase/ha/ha0ha.c @@ -298,6 +298,7 @@ ha_print_info( ulint cells = 0; ulint len = 0; ulint max_len = 0; + ulint n_bufs; ulint i; if (buf_end - buf < 200) { @@ -339,7 +340,16 @@ ha_print_info( "Hash table size %lu, used cells %lu", hash_get_n_cells(table), cells); if (table->heaps == NULL && table->heap != NULL) { - buf += sprintf(buf, -", node heap has %lu buffer(s)\n", UT_LIST_GET_LEN(table->heap->base)); + + /* This calculation is intended for the adaptive hash + index: how many buffer frames we have reserved? */ + + n_bufs = UT_LIST_GET_LEN(table->heap->base) - 1; + + if (table->heap->free_block) { + n_bufs++; + } + + buf += sprintf(buf, ", node heap has %lu buffer(s)\n", n_bufs); } } |