diff options
| author | Igor Babaev <igor@askmonty.org> | 2012-08-18 11:49:14 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2012-08-18 11:49:14 -0700 |
| commit | 584cfcbebd39981cc144f93cbfb007592e538989 (patch) | |
| tree | b9901eae4336d09424164308d808cf370774f760 | |
| parent | 85db02984f2306691df6acce1caf7f146beb471f (diff) | |
| download | mariadb-git-584cfcbebd39981cc144f93cbfb007592e538989.tar.gz | |
Made the process of collecting persistent statistics killable.
| -rw-r--r-- | sql/sql_admin.cc | 2 | ||||
| -rw-r--r-- | sql/sql_statistics.cc | 14 |
2 files changed, 12 insertions, 4 deletions
diff --git a/sql/sql_admin.cc b/sql/sql_admin.cc index 32f70125973..047b8bac94e 100644 --- a/sql/sql_admin.cc +++ b/sql/sql_admin.cc @@ -716,6 +716,8 @@ static bool mysql_admin_table(THD* thd, TABLE_LIST* tables, !(compl_result_code= collect_statistics_for_table(thd, table->table))) compl_result_code= update_statistics_for_table(thd, table->table); + if (compl_result_code) + result_code= HA_ADMIN_FAILED; } if (result_code == HA_ADMIN_NOT_IMPLEMENTED && need_repair_or_alter) diff --git a/sql/sql_statistics.cc b/sql/sql_statistics.cc index c5f9ae5c04e..f58659862c4 100644 --- a/sql/sql_statistics.cc +++ b/sql/sql_statistics.cc @@ -1926,7 +1926,7 @@ void Column_statistics_collected::finish(ha_rows rows) */ static -int collect_statistics_for_index(TABLE *table, uint index) +int collect_statistics_for_index(THD *thd, TABLE *table, uint index) { int rc= 0; KEY *key_info= &table->key_info[index]; @@ -1944,6 +1944,9 @@ int collect_statistics_for_index(TABLE *table, uint index) rc= table->file->ha_index_first(table->record[0]); while (rc != HA_ERR_END_OF_FILE) { + if (thd->killed) + break; + if (rc) break; rows++; @@ -1953,7 +1956,7 @@ int collect_statistics_for_index(TABLE *table, uint index) table->key_read= 0; table->file->ha_index_end(); - rc= (rc == HA_ERR_END_OF_FILE) ? 0 : 1; + rc= (rc == HA_ERR_END_OF_FILE && !thd->killed) ? 0 : 1; if (!rc) index_prefix_calc.get_avg_frequency(); @@ -2040,6 +2043,9 @@ int collect_statistics_for_table(THD *thd, TABLE *table) { while ((rc= file->ha_rnd_next(table->record[0])) != HA_ERR_END_OF_FILE) { + if (thd->killed) + break; + if (rc) break; @@ -2054,7 +2060,7 @@ int collect_statistics_for_table(THD *thd, TABLE *table) } file->ha_rnd_end(); } - rc= rc == HA_ERR_END_OF_FILE ? 0 : 1; + rc= (rc == HA_ERR_END_OF_FILE && !thd->killed) ? 0 : 1; /* Calculate values for all statistical characteristics on columns and @@ -2087,7 +2093,7 @@ int collect_statistics_for_table(THD *thd, TABLE *table) /* Collect statistics for indexes */ while ((key= it++) != key_map::Iterator::BITMAP_END) { - if ((rc= collect_statistics_for_index(table, key))) + if ((rc= collect_statistics_for_index(thd, table, key))) break; } |