diff options
| author | Igor Babaev <igor@askmonty.org> | 2013-10-10 10:08:26 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2013-10-10 10:08:26 -0700 |
| commit | 7c87385e3075143de18e50c1d327eeb2e224603a (patch) | |
| tree | 7819d66c3d59be663839b70b0204d281b849f98a /sql/item.h | |
| parent | ec226e553aa56718ed9939e333fe36b3499ac9be (diff) | |
| download | mariadb-git-7c87385e3075143de18e50c1d327eeb2e224603a.tar.gz | |
Fixed bug mdev-5105.
The bug caused a memory overwrite in the function update_ref_and_keys()
It happened due to a wrong value of SELECT_LEX::cond_count. This value
historically was calculated by the fix_fields method. Now the logic of
calling this method became too complicated and, as a result, this value
is calculated not always correctly.
The patch changes the way how and when the values of SELECT_LEX::cond_count
and of SELECT_LEX::between_count are calculated. The new code does it just at
the beginning of update_ref_and_keys().
Diffstat (limited to 'sql/item.h')
| -rw-r--r-- | sql/item.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/item.h b/sql/item.h index fd19180f3be..4f03d588bbc 100644 --- a/sql/item.h +++ b/sql/item.h @@ -1054,6 +1054,7 @@ public: virtual bool view_used_tables_processor(uchar *arg) { return 0; } virtual bool eval_not_null_tables(uchar *opt_arg) { return 0; } virtual bool is_subquery_processor (uchar *opt_arg) { return 0; } + virtual bool count_sargable_conds(uchar *arg) { return 0; } virtual bool limit_index_condition_pushdown_processor(uchar *opt_arg) { return FALSE; |