diff options
| author | Igor Babaev <igor@askmonty.org> | 2012-01-02 20:06:36 -0800 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2012-01-02 20:06:36 -0800 |
| commit | cd55894a52b5b2bf4a740eb0f39d91d7a82f673c (patch) | |
| tree | 1e484ab2f16bba999b1ce4bb2bdf3a204babc76e /sql/item_subselect.cc | |
| parent | 7714496dc1c72d01fd214cb7737ca4216a982e0f (diff) | |
| download | mariadb-git-cd55894a52b5b2bf4a740eb0f39d91d7a82f673c.tar.gz | |
Fixed LP bug #910083.
The patch for bug 685411 erroneously removed a call of engine->set_thd()
from Item_subselect::fix_fields().
Diffstat (limited to 'sql/item_subselect.cc')
| -rw-r--r-- | sql/item_subselect.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc index 48522f8a70f..699c6e11cc1 100644 --- a/sql/item_subselect.cc +++ b/sql/item_subselect.cc @@ -211,8 +211,7 @@ bool Item_subselect::fix_fields(THD *thd_param, Item **ref) bool res; DBUG_ASSERT(fixed == 0); - /* There is no reason to get a different THD. */ - DBUG_ASSERT(thd == thd_param); + engine->set_thd((thd= thd_param)); if (!done_first_fix_fields) { done_first_fix_fields= TRUE; |