database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Fixed a problem for Q18 from DBT3/SF30 with innodb database instance:

Browse Source 
the server crashed when running the query with persistent statistics
enabled.
The field KEY::read_stat.avg_frequency must be initialized to NULL
for the keys of temporary tables.
This commit is contained in:
Igor Babaev
2012-04-19 09:49:53 -07:00
parent 9e74665a2d
commit 9f53c310d8
3 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sql/sql_select.cc
View File

@ -14657,6 +14657,7 @@ create_tmp_table(THD *thd, TMP_TABLE_PARAM *param, List<Item> &fields,
keyinfo->algorithm= HA_KEY_ALG_UNDEF; keyinfo->algorithm= HA_KEY_ALG_UNDEF;
keyinfo->is_statistics_from_stat_tables= FALSE; keyinfo->is_statistics_from_stat_tables= FALSE;
keyinfo->rec_per_key=0; keyinfo->rec_per_key=0;
keyinfo->read_stat.avg_frequency= NULL;
/* /*
Create an extra field to hold NULL bits so that unique indexes on Create an extra field to hold NULL bits so that unique indexes on

3
sql/sql_statistics.cc
View File

@ -1636,6 +1636,7 @@ void set_statistics_for_table(THD *thd, TABLE *table)
key_info < key_info_end; key_info++) key_info < key_info_end; key_info++)
{ {
key_info->is_statistics_from_stat_tables= key_info->is_statistics_from_stat_tables=
(use_stat_table_mode > 1 && key_info->read_stat.avg_frequency[0] > 0.5); (use_stat_table_mode > 1 && key_info->read_stat.avg_frequency &&
key_info->read_stat.avg_frequency[0] > 0.5);
} }
} }

1
sql/table.cc
View File

@ -5957,6 +5957,7 @@ bool TABLE::add_tmp_key(uint key, uint key_parts,
if (!keyinfo->rec_per_key) if (!keyinfo->rec_per_key)
return TRUE; return TRUE;
bzero(keyinfo->rec_per_key, sizeof(ulong)*key_parts); bzero(keyinfo->rec_per_key, sizeof(ulong)*key_parts);
keyinfo->read_stat.avg_frequency= NULL;
for (i= 0; i < key_parts; i++) for (i= 0; i < key_parts; i++)
{ {