diff options
| author | Jorgen Loland <jorgen.loland@oracle.com> | 2010-12-17 13:52:39 +0100 |
|---|---|---|
| committer | Jorgen Loland <jorgen.loland@oracle.com> | 2010-12-17 13:52:39 +0100 |
| commit | 883a36340b1ffad3c35f914243a209ba118b7702 (patch) | |
| tree | e5a777732d34ed659c419abe89f5f393b0822314 /sql/sql_select.cc | |
| parent | a3b0aefd19b97554940e24a49b85bdab91f5b683 (diff) | |
| download | mariadb-git-883a36340b1ffad3c35f914243a209ba118b7702.tar.gz | |
BUG#58985: Assertion tab->quick->index != 64 failed in make_join_select()
in sql_select.cc
Follow-up patch. Add sanity check for quick select when it is
decided that it should be used.
sql/opt_range.h:
Add is_valid() to QUICK_SELECT*
sql/sql_select.cc:
Add sanity check for quick select when it is decided that it should be used.
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 6e42b65175a..e14b872d18e 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -6504,6 +6504,7 @@ make_join_select(JOIN *join,SQL_SELECT *select,COND *cond) ((tab->type != JT_CONST && tab->type != JT_REF) || (uint)tab->ref.key == tab->quick->index)) { + DBUG_ASSERT(tab->quick->is_valid()); sel->quick=tab->quick; // Use value from get_quick_... sel->quick_keys.clear_all(); sel->needed_reg.clear_all(); |