diff options
| author | Andrei Elkin <andrei.elkin@mariadb.com> | 2019-11-11 16:03:43 +0200 |
|---|---|---|
| committer | Andrei Elkin <andrei.elkin@mariadb.com> | 2019-11-11 16:03:43 +0200 |
| commit | 26fd880d5eba5e46e69f88f21cc6ca45cbda0a4f (patch) | |
| tree | a02a4bb6992f540cd229776680d381c730d2ea77 /sql/sql_select.cc | |
| parent | 142442d571dd86c630019ece82e36dc73e1e5f1b (diff) | |
| parent | 13db50fc03e7312e6c01b06c7e4af69f69ba5382 (diff) | |
| download | mariadb-git-26fd880d5eba5e46e69f88f21cc6ca45cbda0a4f.tar.gz | |
manual merge 10.1->10.2
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index c450572c9bd..b8f23cd135b 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -8003,7 +8003,6 @@ double table_cond_selectivity(JOIN *join, uint idx, JOIN_TAB *s, something went wrong. */ sel /= (double)table->quick_rows[key] / (double) table->stat_records(); - DBUG_ASSERT(0 < sel && sel <= 2.0); set_if_smaller(sel, 1.0); used_range_selectivity= true; } @@ -8052,7 +8051,6 @@ double table_cond_selectivity(JOIN *join, uint idx, JOIN_TAB *s, if (table->field[fldno]->cond_selectivity > 0) { sel /= table->field[fldno]->cond_selectivity; - DBUG_ASSERT(0 < sel && sel <= 2.0); set_if_smaller(sel, 1.0); } /* @@ -8110,7 +8108,6 @@ double table_cond_selectivity(JOIN *join, uint idx, JOIN_TAB *s, if (field->cond_selectivity > 0) { sel/= field->cond_selectivity; - DBUG_ASSERT(0 < sel && sel <= 2.0); set_if_smaller(sel, 1.0); } break; @@ -8122,7 +8119,6 @@ double table_cond_selectivity(JOIN *join, uint idx, JOIN_TAB *s, sel*= table_multi_eq_cond_selectivity(join, idx, s, rem_tables, keyparts, ref_keyuse_steps); - DBUG_ASSERT(0.0 < sel && sel <= 1.0); return sel; } |