diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-08-22 16:45:25 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-08-22 16:45:25 +0200 |
| commit | f72a7659976089dc6f727bb31e8a91306199cf57 (patch) | |
| tree | 0199cd1bf1c16b01b358ab88e5dce5b038349872 /sql/sql_prepare.cc | |
| parent | ed06ba3492d55c9e9dde231b55352f854e5e4b50 (diff) | |
| parent | 1fd8150a5b5e3f56aa3c253225929a07ee9a4026 (diff) | |
| download | mariadb-git-f72a7659976089dc6f727bb31e8a91306199cf57.tar.gz | |
5.2 merge.
two tests still fail:
main.innodb_icp and main.range_vs_index_merge_innodb
call records_in_range() with both range ends being open
(which triggers an assert)
Diffstat (limited to 'sql/sql_prepare.cc')
| -rw-r--r-- | sql/sql_prepare.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index 273e234edde..52584ef3d18 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -2454,6 +2454,14 @@ void reinit_stmt_before_use(THD *thd, LEX *lex) DBUG_ASSERT(sl->join == 0); ORDER *order; /* Fix GROUP list */ + if (sl->group_list_ptrs && sl->group_list_ptrs->size() > 0) + { + for (uint ix= 0; ix < sl->group_list_ptrs->size() - 1; ++ix) + { + order= sl->group_list_ptrs->at(ix); + order->next= sl->group_list_ptrs->at(ix+1); + } + } for (order= sl->group_list.first; order; order= order->next) order->item= &order->item_ptr; /* Fix ORDER list */ |