diff options
| author | unknown <aelkin@mysql.com> | 2006-02-14 20:48:34 +0200 |
|---|---|---|
| committer | unknown <aelkin@mysql.com> | 2006-02-14 20:48:34 +0200 |
| commit | 85305ce79cc870ea85596a7d52e661d0660da7c5 (patch) | |
| tree | 005ea2bc06d7d8ab8cacf1f754769cd2adfb6967 /sql/item_cmpfunc.cc | |
| parent | 75dd30dfce2db2785b9545ba73fae77b8bdd963f (diff) | |
| parent | 86c920ba776ddf5e9999e8293d5824be25bb43b6 (diff) | |
| download | mariadb-git-85305ce79cc870ea85596a7d52e661d0660da7c5.tar.gz | |
Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.1-new
BitKeeper/deleted/.del-ctype_ucs_binlog.result~280d136b1a0bcf17:
Auto merged
mysql-test/r/user_var-binlog.result:
Auto merged
mysql-test/t/mysql.test:
Auto merged
mysql-test/t/mysqlbinlog.test:
Auto merged
mysql-test/t/rpl_trigger.test:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
mysql-test/r/rpl_stm_charset.result:
Auto merged
sql/log_event.cc:
Auto merged
sql/sql_select.cc:
Auto merged
mysql-test/r/rpl_timezone.result:
manual merge use local. Result file has to be refined according to changes brought in
to the test.
Diffstat (limited to 'sql/item_cmpfunc.cc')
| -rw-r--r-- | sql/item_cmpfunc.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc index e2eb60892f4..c22213e774a 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -1383,7 +1383,8 @@ Item_func_if::fix_length_and_dec() max_length= (cached_result_type == DECIMAL_RESULT || cached_result_type == INT_RESULT) ? (max(args[1]->max_length - args[1]->decimals, - args[2]->max_length - args[2]->decimals) + decimals) : + args[2]->max_length - args[2]->decimals) + decimals + + (unsigned_flag ? 0 : 1) ) : max(args[1]->max_length, args[2]->max_length); } |