diff options
| author | unknown <bar@mysql.com> | 2005-01-18 21:38:40 +0400 |
|---|---|---|
| committer | unknown <bar@mysql.com> | 2005-01-18 21:38:40 +0400 |
| commit | 7e842896b8d3189856d2c349e8b07b5d4b27ca06 (patch) | |
| tree | 17bc0181a67b221bd9dd2e7753cfd0f73b890d5e /sql/item_cmpfunc.cc | |
| parent | 9f93b015898a6c9bc92333b5d8951024725e39c1 (diff) | |
| parent | 9ab94d6ca628851e01d022d53501a490048f0281 (diff) | |
| download | mariadb-git-7e842896b8d3189856d2c349e8b07b5d4b27ca06.tar.gz | |
merge
mysql-test/r/metadata.result:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
Diffstat (limited to 'sql/item_cmpfunc.cc')
| -rw-r--r-- | sql/item_cmpfunc.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc index 16a3e86e519..4fbe7c241d1 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -1119,6 +1119,9 @@ Item_func_nullif::fix_length_and_dec() max_length=args[0]->max_length; decimals=args[0]->decimals; agg_result_type(&cached_result_type, args, 2); + if (cached_result_type == STRING_RESULT && + agg_arg_charsets(collation, args, arg_count, MY_COLL_CMP_CONV)) + return; } } |