diff options
| author | Alexander Barkov <bar@mnogosearch.org> | 2013-11-21 13:16:26 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mnogosearch.org> | 2013-11-21 13:16:26 +0400 |
| commit | 146c8a4874b3bb09d412b115ddec70bd57226c7b (patch) | |
| tree | 70c9468c922f1c6a03f642712a6d63fa0d615cd4 /sql/opt_subselect.cc | |
| parent | 170e9e593df52643653269a61efbdc35076a1190 (diff) | |
| parent | d7463f8e59fdc0dd18747dd500998ac4c8f83dff (diff) | |
| download | mariadb-git-146c8a4874b3bb09d412b115ddec70bd57226c7b.tar.gz | |
Merge 5.5->10.0-base
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 0daf7aee3a9..78a1f5fb326 100644 --- a/sql/opt_subselect.cc +++ b/sql/opt_subselect.cc @@ -1311,7 +1311,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); |