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

less default_charset_info

Browse Source
This commit is contained in:
bar@bar.mysql.r18.ru
2002-12-20 17:57:24 +04:00
parent df64544b77
commit cb619f3a11
5 changed files with 38 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sql/sql_class.cc
View File

@ -526,7 +526,7 @@ bool select_send::send_data(List<Item> &items)
List_iterator_fast<Item> li(items);
Protocol *protocol= thd->protocol;
char buff[MAX_FIELD_WIDTH];
String buffer(buff, sizeof(buff), system_charset_info);
String buffer(buff, sizeof(buff), NULL);
DBUG_ENTER("send_data");
protocol->prepare_for_resend();
@ -649,7 +649,7 @@ bool select_export::send_data(List<Item> &items)
DBUG_ENTER("send_data");
char buff[MAX_FIELD_WIDTH],null_buff[2],space[MAX_FIELD_WIDTH];
bool space_inited=0;
String tmp(buff,sizeof(buff),default_charset_info),*res;
String tmp(buff,sizeof(buff),NULL),*res;
tmp.length(0);
if (unit->offset_limit_cnt)
@ -710,10 +710,11 @@ bool select_export::send_data(List<Item> &items)
pos++)
{
#ifdef USE_MB
if (use_mb(default_charset_info))
CHARSET_INFO *res_charset=res->charset();
if (use_mb(res_charset))
{
int l;
if ((l=my_ismbchar(default_charset_info, pos, end)))
if ((l=my_ismbchar(res_charset, pos, end)))
{
pos += l-1;
continue;
@ -856,7 +857,7 @@ bool select_dump::send_data(List<Item> &items)
{
List_iterator_fast<Item> li(items);
char buff[MAX_FIELD_WIDTH];
String tmp(buff,sizeof(buff),default_charset_info),*res;
String tmp(buff,sizeof(buff),NULL),*res;
tmp.length(0);
Item *item;
DBUG_ENTER("send_data");