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

Old style charset() and set_charset() were removed.

Browse Source
This commit is contained in:
unknown
2003-08-05 12:52:37 +05:00
parent 970f910d75
commit e8da290b09
15 changed files with 109 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/sql_select.cc
View File

@ -4229,9 +4229,9 @@ Field *create_tmp_field(THD *thd, TABLE *table,Item *item, Item::Type type,
case STRING_RESULT:
if (item_sum->max_length > 255)
return new Field_blob(item_sum->max_length,maybe_null,
item->name,table,item->charset());
item->name,table,item->collation.collation);
return new Field_string(item_sum->max_length,maybe_null,
item->name,table,item->charset());
item->name,table,item->collation.collation);
case ROW_RESULT:
default:
// This case should never be choosen
@ -4288,10 +4288,10 @@ Field *create_tmp_field(THD *thd, TABLE *table,Item *item, Item::Type type,
case STRING_RESULT:
if (item->max_length > 255)
new_field= new Field_blob(item->max_length,maybe_null,
item->name,table,item->charset());
item->name,table,item->collation.collation);
else
new_field= new Field_string(item->max_length,maybe_null,
item->name,table,item->charset());
item->name,table,item->collation.collation);
break;
case ROW_RESULT:
default: