database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

rollback of bug #40761 fix

Browse Source
This commit is contained in:
Gleb Shchepa
2008-12-12 14:59:10 +04:00
parent ce8ad64dd2
commit 03f9b2cea6
6 changed files with 29 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
sql/item_cmpfunc.cc
View File

@@ -2069,23 +2069,21 @@ Item_func_ifnull::fix_length_and_dec()
{
agg_result_type(&hybrid_type, args, 2);
maybe_null=args[1]->maybe_null;
decimals= max(args[0]->decimals, args[1]->decimals);
unsigned_flag= args[0]->unsigned_flag && args[1]->unsigned_flag;
if (hybrid_type == DECIMAL_RESULT || hybrid_type == INT_RESULT)
{
max_length= 0;
decimals= 0;
unsigned_flag= TRUE;
agg_num_lengths(args[0]);
agg_num_lengths(args[1]);
max_length= my_decimal_precision_to_length(max_length + decimals, decimals,
unsigned_flag);
int len0= args[0]->max_length - args[0]->decimals
- (args[0]->unsigned_flag ? 0 : 1);
int len1= args[1]->max_length - args[1]->decimals
- (args[1]->unsigned_flag ? 0 : 1);
max_length= max(len0, len1) + decimals + (unsigned_flag ? 0 : 1);
}
else
{
max_length= max(args[0]->max_length, args[1]->max_length);
decimals= max(args[0]->decimals, args[1]->decimals);
unsigned_flag=args[0]->unsigned_flag && args[1]->unsigned_flag;
}
switch (hybrid_type) {
case STRING_RESULT:
@@ -2240,6 +2238,8 @@ void
Item_func_if::fix_length_and_dec()
{
maybe_null=args[1]->maybe_null || args[2]->maybe_null;
decimals= max(args[1]->decimals, args[2]->decimals);
unsigned_flag=args[1]->unsigned_flag && args[2]->unsigned_flag;
enum Item_result arg1_type=args[1]->result_type();
enum Item_result arg2_type=args[2]->result_type();
@@ -2276,20 +2276,16 @@ Item_func_if::fix_length_and_dec()
if ((cached_result_type == DECIMAL_RESULT )
|| (cached_result_type == INT_RESULT))
{
max_length= 0;
decimals= 0;
unsigned_flag= TRUE;
agg_num_lengths(args[1]);
agg_num_lengths(args[2]);
max_length= my_decimal_precision_to_length(max_length + decimals, decimals,
unsigned_flag);
int len1= args[1]->max_length - args[1]->decimals
- (args[1]->unsigned_flag ? 0 : 1);
int len2= args[2]->max_length - args[2]->decimals
- (args[2]->unsigned_flag ? 0 : 1);
max_length=max(len1, len2) + decimals + (unsigned_flag ? 0 : 1);
}
else
{
max_length= max(args[1]->max_length, args[2]->max_length);
decimals= max(args[1]->decimals, args[2]->decimals);
unsigned_flag=args[1]->unsigned_flag && args[2]->unsigned_flag;
}
}
@@ -2637,6 +2633,16 @@ void Item_func_case::agg_str_lengths(Item* arg)
}
void Item_func_case::agg_num_lengths(Item *arg)
{
uint len= my_decimal_length_to_precision(arg->max_length, arg->decimals,
arg->unsigned_flag) - arg->decimals;
set_if_bigger(max_length, len);
set_if_bigger(decimals, arg->decimals);
unsigned_flag= unsigned_flag && arg->unsigned_flag;
}
void Item_func_case::fix_length_and_dec()
{
Item **agg;