diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2014-02-19 18:34:12 +0400 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2014-02-19 18:34:12 +0400 |
| commit | 6ebaa4939e0a4e22491a4a251863f0b31af90829 (patch) | |
| tree | c131ced911f9402451fa299b0960cf16b0ec566f /pcre | |
| parent | ddc21f7977b47d8779b7f596b82798d222b1e808 (diff) | |
| download | mariadb-git-6ebaa4939e0a4e22491a4a251863f0b31af90829.tar.gz | |
Backport the following from 5.5 to 5.3:
MDEV-4556 Server crashes in SEL_ARG::rb_insert with index_merge+index_merge_sort_union, FORCE INDEX
- merge_same_index_scans() may put the same SEL_ARG tree in multiple result plans.
make it call incr_refs() on the SEL_ARG trees that it does key_or() on, because
key_or(sel_arg_tree_1, sel_arg_tree_2) call may invalidate SEL_ARG trees pointed
by sel_arg_tree_1 and sel_arg_tree_2.
Diffstat (limited to 'pcre')
0 files changed, 0 insertions, 0 deletions