diff options
| author | unknown <sanja@montyprogram.com> | 2013-10-29 18:50:36 +0200 |
|---|---|---|
| committer | unknown <sanja@montyprogram.com> | 2013-10-29 18:50:36 +0200 |
| commit | 52dea41052bc1be1efbe59c320046d7e62cfd0a6 (patch) | |
| tree | 515c69dbce80f1af73974286de8f87413b1cad23 /sql/sql_prepare.cc | |
| parent | 86901216fd4f7eb0844e884203810a0e43fcd103 (diff) | |
| parent | 5ce11d8b4ca2a57968656925a69ed8114d5374f6 (diff) | |
| download | mariadb-git-52dea41052bc1be1efbe59c320046d7e62cfd0a6.tar.gz | |
Merge 5.3->5.5
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 6b4865027c8..a0ec07b9db2 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -2544,7 +2544,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(); |