diff options
| author | monty@mysql.com <> | 2004-02-09 12:31:03 +0100 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-02-09 12:31:03 +0100 |
| commit | 06432eac3606d75045109e3bad2538543f1a574b (patch) | |
| tree | 4cdb6965fba280ace2fc30421a0f25332597e43e /sql/item_func.cc | |
| parent | 480b082cf44db4fb2722e256f16e5f8c7c537bcf (diff) | |
| download | mariadb-git-06432eac3606d75045109e3bad2538543f1a574b.tar.gz | |
Added --compact to mysqlbinlog
Fixed output from mysqlbinlog when using --skip-comments
Fixed warnings from valgrind
Fixed ref_length when used with HEAP tables
More efficent need_conversion()
Fixed error handling in UPDATE with not updateable tables
Fixed bug in null handling in CAST to signed/unsigned
Diffstat (limited to 'sql/item_func.cc')
| -rw-r--r-- | sql/item_func.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index efeb0d456ef..b1378784f92 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -1068,9 +1068,8 @@ String *Item_func_min_max::val_str(String *str) } } } - if (!res) // If NULL - return 0; - res->set_charset(collation.collation); + if (res) // If !NULL + res->set_charset(collation.collation); return res; } case ROW_RESULT: |