diff options
| author | Alexander Barkov <bar@mariadb.org> | 2015-09-06 13:25:47 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2015-09-06 13:25:47 +0400 |
| commit | e0df116056237beb89faa3527938b7ec7b1e15ec (patch) | |
| tree | 089b17d3b2f331f65608922783166d4a58682bb3 /sql/item_cmpfunc.cc | |
| parent | c108019a48451147b456aed0d988773eee32a55b (diff) | |
| download | mariadb-git-e0df116056237beb89faa3527938b7ec7b1e15ec.tar.gz | |
A clean-up after the patch for MDEV-8747 and MDEV-8749:
removing IMPOSSIBLE_RESULT from Item_result, as it's not
needed any more. The fact that an Item is not in a comparison
context is now always designated by IDENTITY_SUBST in Subst_constraint.
Previously IMPOSSIBLE_RESULT and IDENTITY_SUBST co-existed but
actually meant the same thing.
Diffstat (limited to 'sql/item_cmpfunc.cc')
| -rw-r--r-- | sql/item_cmpfunc.cc | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc index d6a113e0ecb..3bfee49560c 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -612,9 +612,6 @@ int Arg_comparator::set_compare_func(Item_func_or_sum *item, Item_result type) } break; } - case IMPOSSIBLE_RESULT: - DBUG_ASSERT(0); - break; } return 0; } @@ -2358,7 +2355,6 @@ longlong Item_func_between::val_int() break; } case ROW_RESULT: - case IMPOSSIBLE_RESULT: DBUG_ASSERT(0); null_value= 1; return 0; @@ -2417,7 +2413,6 @@ Item_func_case_abbreviation2::fix_length_and_dec2(Item **args) break; case ROW_RESULT: case TIME_RESULT: - case IMPOSSIBLE_RESULT: DBUG_ASSERT(0); } fix_char_length(char_length); @@ -3375,7 +3370,6 @@ void Item_func_coalesce::fix_length_and_dec() break; case ROW_RESULT: case TIME_RESULT: - case IMPOSSIBLE_RESULT: DBUG_ASSERT(0); } } @@ -3739,9 +3733,6 @@ cmp_item* cmp_item::get_comparator(Item_result type, Item *warn_item, case TIME_RESULT: DBUG_ASSERT(warn_item); return new cmp_item_datetime(warn_item); - case IMPOSSIBLE_RESULT: - DBUG_ASSERT(0); - break; } return 0; // to satisfy compiler :) } @@ -4164,9 +4155,6 @@ void Item_func_in::fix_length_and_dec() date_arg= find_date_time_item(args, arg_count, 0); array= new (thd->mem_root) in_datetime(date_arg, arg_count - 1); break; - case IMPOSSIBLE_RESULT: - DBUG_ASSERT(0); - break; } if (array && !(thd->is_fatal_error)) // If not EOM { |