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

Strings which appear without charset context,

Browse Source 
like number-to-string-convertion-result, now 
takes current database character set, instead of
thread character set. This makes it easy to be
SQL99 conformant and 4.0 compatible.

Item->thd_charset() is renamed to Item->default_charset()
as old name doesn't describe its nature anymore.
This commit is contained in:
unknown
2003-03-03 10:53:08 +04:00
parent 16cdf759a1
commit 310545adf0
11 changed files with 111 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
sql/item_sum.cc
View File

@ -124,7 +124,7 @@ Item_sum_num::val_str(String *str)
double nr=val();
if (null_value)
return 0;
str->set(nr,decimals,thd_charset());
str->set(nr,decimals,default_charset());
return str;
}
@ -135,7 +135,7 @@ Item_sum_int::val_str(String *str)
longlong nr=val_int();
if (null_value)
return 0;
str->set(nr,thd_charset());
str->set(nr,default_charset());
return str;
}
@ -416,13 +416,13 @@ Item_sum_hybrid::val_str(String *str)
case STRING_RESULT:
return &value;
case REAL_RESULT:
str->set(sum,decimals,thd_charset());
str->set(sum,decimals,default_charset());
break;
case INT_RESULT:
if (unsigned_flag)
str->set((ulonglong) sum_int,thd_charset());
str->set((ulonglong) sum_int,default_charset());
else
str->set((longlong) sum_int,thd_charset());
str->set((longlong) sum_int,default_charset());
break;
case ROW_RESULT:
default:
@ -879,7 +879,7 @@ String *Item_avg_field::val_str(String *str)
double nr=Item_avg_field::val();
if (null_value)
return 0;
str->set(nr,decimals,thd_charset());
str->set(nr,decimals,default_charset());
return str;
}
@ -927,7 +927,7 @@ String *Item_variance_field::val_str(String *str)
double nr=val();
if (null_value)
return 0;
str->set(nr,decimals,thd_charset());
str->set(nr,decimals,default_charset());
return str;
}
@ -1281,7 +1281,7 @@ String *Item_sum_udf_float::val_str(String *str)
if (null_value)
return 0; /* purecov: inspected */
else
str->set(nr,decimals,thd_charset());
str->set(nr,decimals,default_charset());
return str;
}
@ -1300,7 +1300,7 @@ String *Item_sum_udf_int::val_str(String *str)
if (null_value)
return 0;
else
str->set(nr,thd_charset());
str->set(nr,default_charset());
return str;
}