diff options
| author | Alexander Barkov <bar@mnogosearch.org> | 2013-11-13 19:16:35 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mnogosearch.org> | 2013-11-13 19:16:35 +0400 |
| commit | d7463f8e59fdc0dd18747dd500998ac4c8f83dff (patch) | |
| tree | 4f51344826b7aa6d6715fbdb6bb9ea9ca4600379 /sql/opt_subselect.cc | |
| parent | f3a78f392dad24391c19464731833e2bdf19bdef (diff) | |
| parent | e4608eb3c161709df8d81dfba98ef67a4957d3ee (diff) | |
| download | mariadb-git-d7463f8e59fdc0dd18747dd500998ac4c8f83dff.tar.gz | |
Merge 5.3 -> 5.5
Diffstat (limited to 'sql/opt_subselect.cc')
| -rw-r--r-- | sql/opt_subselect.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/opt_subselect.cc b/sql/opt_subselect.cc index 047b3d7e586..47771a10ae7 100644 --- a/sql/opt_subselect.cc +++ b/sql/opt_subselect.cc @@ -1307,7 +1307,6 @@ static bool replace_where_subcondition(JOIN *join, Item **expr, } else if (item->type() == Item::COND_ITEM) { - DBUG_ASSERT(!do_fix_fields || !(*expr)->fixed); replace_where_subcondition(join, li.ref(), old_cond, new_cond, do_fix_fields); |