diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-05-16 14:24:29 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-05-16 14:24:29 +0300 |
| commit | 3d56adbfac394b2b3ffd22a89fe7c2978ed9a505 (patch) | |
| tree | 20d568348fb9aab84446988823f1a971f45a7aca /sql | |
| parent | b7d22a843e36cd5b8695f8ac2b92789d1cf50e4f (diff) | |
| parent | 796486d19b7eede58566620dfd110d24ac723218 (diff) | |
| download | mariadb-git-3d56adbfac394b2b3ffd22a89fe7c2978ed9a505.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/opt_range.cc | 2 | ||||
| -rw-r--r-- | sql/sql_statistics.cc | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/sql/opt_range.cc b/sql/opt_range.cc index 59f21d31279..ec7b3dbbd7a 100644 --- a/sql/opt_range.cc +++ b/sql/opt_range.cc @@ -3045,7 +3045,7 @@ bool calculate_cond_selectivity_for_table(THD *thd, TABLE *table, Item **cond) if (thd->variables.optimizer_use_condition_selectivity > 2 && !bitmap_is_clear_all(used_fields) && - thd->variables.use_stat_tables > 0) + thd->variables.use_stat_tables > 0 && table->stats_is_read) { PARAM param; MEM_ROOT alloc; diff --git a/sql/sql_statistics.cc b/sql/sql_statistics.cc index 9ed49cef3e6..5b8c1b63b6f 100644 --- a/sql/sql_statistics.cc +++ b/sql/sql_statistics.cc @@ -2199,6 +2199,9 @@ inline bool statistics_for_command_is_needed(THD *thd) case SQLCOM_DELETE_MULTI: case SQLCOM_REPLACE: case SQLCOM_REPLACE_SELECT: + case SQLCOM_CREATE_TABLE: + case SQLCOM_SET_OPTION: + case SQLCOM_DO: break; default: return FALSE; |