mirror of
https://github.com/MariaDB/server.git
synced 2026-04-20 15:25:33 +02:00
Applied innodb-5.0-ss677 snapshot.
Fixes: - bug #19834: Using cursors when running in READ-COMMITTED can cause InnoDB to crash - bug #21112: InnoDB slow with > 100,000 .ibd files - bug #21113: Duplicate printout in SHOW INNODB STATUS innobase/fil/fil0fil.c: Applied innodb-5.0-ss677 snapshot. Make the tablespace cache hash size 100 or 1000 times bigger. Fixes bug #21112. innobase/ibuf/ibuf0ibuf.c: Applied innodb-5.0-ss677 snapshot. ibuf_print(): Don't print redundant information. Fixes bug #21113. sql/ha_innodb.cc: Applied innodb-5.0-ss677 snapshot. ha_innobase::start_stmt(): patch from Heikki: Do not call read_view_close_for_mysql(). (Bug #19834)
This commit is contained in:
parent
edeea349b9
commit
75e40b161b
3 changed files with 20 additions and 37 deletions
|
|
@ -251,9 +251,6 @@ struct fil_system_struct {
|
|||
initialized. */
|
||||
fil_system_t* fil_system = NULL;
|
||||
|
||||
/* The tablespace memory cache hash table size */
|
||||
#define FIL_SYSTEM_HASH_SIZE 50 /* TODO: make bigger! */
|
||||
|
||||
|
||||
/************************************************************************
|
||||
NOTE: you must call fil_mutex_enter_and_prepare_for_io() first!
|
||||
|
|
@ -1324,11 +1321,17 @@ fil_init(
|
|||
/*=====*/
|
||||
ulint max_n_open) /* in: max number of open files */
|
||||
{
|
||||
ulint hash_size;
|
||||
|
||||
ut_a(fil_system == NULL);
|
||||
|
||||
/*printf("Initializing the tablespace cache with max %lu open files\n",
|
||||
max_n_open); */
|
||||
fil_system = fil_system_create(FIL_SYSTEM_HASH_SIZE, max_n_open);
|
||||
if (srv_file_per_table) {
|
||||
hash_size = 50000;
|
||||
} else {
|
||||
hash_size = 5000;
|
||||
}
|
||||
|
||||
fil_system = fil_system_create(hash_size, max_n_open);
|
||||
}
|
||||
|
||||
/***********************************************************************
|
||||
|
|
|
|||
|
|
@ -3499,21 +3499,9 @@ ibuf_print(
|
|||
data = UT_LIST_GET_FIRST(ibuf->data_list);
|
||||
|
||||
while (data) {
|
||||
fprintf(file,
|
||||
"Ibuf for space %lu: size %lu, free list len %lu, seg size %lu,",
|
||||
(ulong) data->space, (ulong) data->size,
|
||||
(ulong) data->free_list_len,
|
||||
(ulong) data->seg_size);
|
||||
|
||||
if (data->empty) {
|
||||
fputs(" is empty\n", file);
|
||||
} else {
|
||||
fputs(" is not empty\n", file);
|
||||
}
|
||||
fprintf(file,
|
||||
"Ibuf for space %lu: size %lu, free list len %lu, seg size %lu,\n"
|
||||
"%lu inserts, %lu merged recs, %lu merges\n",
|
||||
(ulong) data->space,
|
||||
"Ibuf: size %lu, free list len %lu, seg size %lu,\n"
|
||||
"%lu inserts, %lu merged recs, %lu merges\n",
|
||||
(ulong) data->size,
|
||||
(ulong) data->free_list_len,
|
||||
(ulong) data->seg_size,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue