diff options
| author | Sergey Vojtovich <svoj@mariadb.org> | 2019-10-02 16:04:52 +0400 |
|---|---|---|
| committer | Sergey Vojtovich <svoj@mariadb.org> | 2019-10-07 13:30:22 +0400 |
| commit | adefaeffcce7c4ae0844f72dd920603b35285d40 (patch) | |
| tree | e5396eeec14a2283b36f5b0ff208562a21e7ef99 /sql/sql_class.cc | |
| parent | e43791d4dc8feb2c02a08ce73c0bb0e2c320018c (diff) | |
| download | mariadb-git-adefaeffcce7c4ae0844f72dd920603b35285d40.tar.gz | |
MDEV-19536 - Server crash or ASAN heap-use-after-free in is_temporary_table /
read_statistics_for_tables_if_needed
Regression after 279a907, read_statistics_for_tables_if_needed() was
called after open_normal_and_derived_tables() failure.
Fixed by moving read_statistics_for_tables() call to a branch of
get_schema_stat_record() where result of open_normal_and_derived_tables()
is checked.
Removed THD::force_read_stats, added read_statistics_for_tables() instead.
Simplified away statistics_for_command_is_needed().
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 1a3ca54abf8..ab105c67507 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -986,7 +986,6 @@ THD::THD(bool is_wsrep_applier) memset(&invoker_host, 0, sizeof(invoker_host)); prepare_derived_at_open= FALSE; create_tmp_table_for_derived= FALSE; - force_read_stats= FALSE; save_prep_leaf_list= FALSE; /* Restore THR_THD */ set_current_thd(old_THR_THD); |