diff options
| author | Mikael Ronström <mikael@dator9> | 2011-05-12 14:29:32 +0200 |
|---|---|---|
| committer | Mikael Ronström <mikael@dator9> | 2011-05-12 14:29:32 +0200 |
| commit | 69396894f15f145ad48d45f21bba1d902602c96a (patch) | |
| tree | b38b221786a2d3d9fc1ff6572ad859f7aeacde27 /sql/item_cmpfunc.cc | |
| parent | b444c4f2d3e1020a5469f12e5ae460be85925c10 (diff) | |
| parent | f1bad788e5592535983a35d04453d1f642474925 (diff) | |
| download | mariadb-git-69396894f15f145ad48d45f21bba1d902602c96a.tar.gz | |
merge
Diffstat (limited to 'sql/item_cmpfunc.cc')
| -rw-r--r-- | sql/item_cmpfunc.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc index cf5da5313d9..e0057d1550b 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -4345,7 +4345,7 @@ bool Item_cond::walk(Item_processor processor, bool walk_subquery, uchar *arg) Item *Item_cond::transform(Item_transformer transformer, uchar *arg) { - DBUG_ASSERT(!current_thd->is_stmt_prepare()); + DBUG_ASSERT(!current_thd->stmt_arena->is_stmt_prepare()); List_iterator<Item> li(list); Item *item; @@ -5718,7 +5718,7 @@ bool Item_equal::walk(Item_processor processor, bool walk_subquery, uchar *arg) Item *Item_equal::transform(Item_transformer transformer, uchar *arg) { - DBUG_ASSERT(!current_thd->is_stmt_prepare()); + DBUG_ASSERT(!current_thd->stmt_arena->is_stmt_prepare()); List_iterator<Item_field> it(fields); Item *item; |