diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2018-09-03 10:57:02 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2018-09-03 10:57:02 +0200 |
| commit | b9bc3c24630980b260b91fc856689dbad336064e (patch) | |
| tree | 63c6339feb795a0419540f6c63c41ff58a0ffd2d /sql/item.cc | |
| parent | b3c320bb0b93e516cda4db277cfa3efeef48c988 (diff) | |
| parent | 43c393ff4732e9ea8719864abeb73cefd5b528a9 (diff) | |
| download | mariadb-git-b9bc3c24630980b260b91fc856689dbad336064e.tar.gz | |
Merge branch '5.5' into 10.0bb-10.0-merge-sanja
Diffstat (limited to 'sql/item.cc')
| -rw-r--r-- | sql/item.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/sql/item.cc b/sql/item.cc index fca8a887f46..7f1ec42b029 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -8707,13 +8707,11 @@ void Item_trigger_field::cleanup() Item_result item_cmp_type(Item_result a,Item_result b) { - if (a == STRING_RESULT && b == STRING_RESULT) - return STRING_RESULT; - if (a == INT_RESULT && b == INT_RESULT) - return INT_RESULT; - else if (a == ROW_RESULT || b == ROW_RESULT) + if (a == b) + return a; + if (a == ROW_RESULT || b == ROW_RESULT) return ROW_RESULT; - else if (a == TIME_RESULT || b == TIME_RESULT) + if (a == TIME_RESULT || b == TIME_RESULT) return TIME_RESULT; if ((a == INT_RESULT || a == DECIMAL_RESULT) && (b == INT_RESULT || b == DECIMAL_RESULT)) |