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:
bar@bar.mysql.r18.ru
2003-08-05 12:52:37 +05:00
parent 708ddc3a3b
commit a60acfcfe0
15 changed files with 109 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sql/sql_analyse.cc
View File

@ -326,9 +326,9 @@ void field_str::add()
if (length > max_length)
max_length = length;
if (sortcmp(res, &min_arg,item->charset()) < 0)
if (sortcmp(res, &min_arg,item->collation.collation) < 0)
min_arg.copy(*res);
if (sortcmp(res, &max_arg,item->charset()) > 0)
if (sortcmp(res, &max_arg,item->collation.collation) > 0)
max_arg.copy(*res);
}
@ -736,7 +736,7 @@ void field_str::get_opt_type(String *answer, ha_rows total_rows)
{
if (must_be_blob)
{
if (item->charset() == &my_charset_bin)
if (item->collation.collation == &my_charset_bin)
answer->append("TINYBLOB", 8);
else
answer->append("TINYTEXT", 8);
@ -754,21 +754,21 @@ void field_str::get_opt_type(String *answer, ha_rows total_rows)
}
else if (max_length < (1L << 16))
{
if (item->charset() == &my_charset_bin)
if (item->collation.collation == &my_charset_bin)
answer->append("BLOB", 4);
else
answer->append("TEXT", 4);
}
else if (max_length < (1L << 24))
{
if (item->charset() == &my_charset_bin)
if (item->collation.collation == &my_charset_bin)
answer->append("MEDIUMBLOB", 10);
else
answer->append("MEDIUMTEXT", 10);
}
else
{
if (item->charset() == &my_charset_bin)
if (item->collation.collation == &my_charset_bin)
answer->append("LONGBLOB", 8);
else
answer->append("LONGTEXT", 8);