diff options
| author | unknown <sanja@montyprogram.com> | 2013-10-29 20:53:05 +0200 |
|---|---|---|
| committer | unknown <sanja@montyprogram.com> | 2013-10-29 20:53:05 +0200 |
| commit | f4d5d849fd3b526d38ca6eb083fd0b290eb0eda7 (patch) | |
| tree | bf55c043320485e4ce5c8be90c8d619b481a0306 /sql/sql_prepare.cc | |
| parent | fef416699009b78366d9eec937c01822b531f518 (diff) | |
| parent | 52dea41052bc1be1efbe59c320046d7e62cfd0a6 (diff) | |
| download | mariadb-git-f4d5d849fd3b526d38ca6eb083fd0b290eb0eda7.tar.gz | |
merge 5.5->10.0-base
Diffstat (limited to 'sql/sql_prepare.cc')
| -rw-r--r-- | sql/sql_prepare.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index f4371624d6c..07b90fd406c 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -2552,7 +2552,13 @@ void reinit_stmt_before_use(THD *thd, LEX *lex) /* Fix ORDER list */ for (order= sl->order_list.first; order; order= order->next) order->item= &order->item_ptr; - sl->handle_derived(lex, DT_REINIT); + { +#ifndef DBUG_OFF + bool res= +#endif + sl->handle_derived(lex, DT_REINIT); + DBUG_ASSERT(res == 0); + } } { SELECT_LEX_UNIT *unit= sl->master_unit(); |