database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +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

30
sql/item_func.cc
View File

@ -286,7 +286,7 @@ String *Item_real_func::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;
}
@ -299,9 +299,9 @@ String *Item_num_func::val_str(String *str)
if (null_value)
return 0; /* purecov: inspected */
else if (!unsigned_flag)
str->set(nr,thd_charset());
str->set(nr,default_charset());
else
str->set((ulonglong) nr,thd_charset());
str->set((ulonglong) nr,default_charset());
}
else
{
@ -309,7 +309,7 @@ String *Item_num_func::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;
}
@ -336,9 +336,9 @@ String *Item_int_func::val_str(String *str)
if (null_value)
return 0;
else if (!unsigned_flag)
str->set(nr,thd_charset());
str->set(nr,default_charset());
else
str->set((ulonglong) nr,thd_charset());
str->set((ulonglong) nr,default_charset());
return str;
}
@ -365,9 +365,9 @@ String *Item_num_op::val_str(String *str)
if (null_value)
return 0; /* purecov: inspected */
else if (!unsigned_flag)
str->set(nr,thd_charset());
str->set(nr,default_charset());
else
str->set((ulonglong) nr,thd_charset());
str->set((ulonglong) nr,default_charset());
}
else
{
@ -375,7 +375,7 @@ String *Item_num_op::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;
}
@ -890,9 +890,9 @@ String *Item_func_min_max::val_str(String *str)
if (null_value)
return 0;
else if (!unsigned_flag)
str->set(nr,thd_charset());
str->set(nr,default_charset());
else
str->set((ulonglong) nr,thd_charset());
str->set((ulonglong) nr,default_charset());
return str;
}
case REAL_RESULT:
@ -901,7 +901,7 @@ String *Item_func_min_max::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;
}
case STRING_RESULT:
@ -1563,7 +1563,7 @@ String *Item_func_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;
}
@ -1584,9 +1584,9 @@ String *Item_func_udf_int::val_str(String *str)
if (null_value)
return 0;
else if (!unsigned_flag)
str->set(nr,thd_charset());
str->set(nr,default_charset());
else
str->set((ulonglong) nr,thd_charset());
str->set((ulonglong) nr,default_charset());
return str;
}