1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1

Browse Source 
into sanja.is.com.ua:/home/bell/mysql/mysql-4.1
This commit is contained in:
unknown 2003-03-15 13:35:40 +02:00
commit ced5e414b6
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sql/sql_lex.cc
View File

@ -209,6 +209,7 @@ static char *get_text(LEX *lex)
{ {
reg1 uchar c,sep; reg1 uchar c,sep;
uint found_escape=0; uint found_escape=0;
CHARSET_INFO *cs= lex->thd->variables.thd_charset;
sep= yyGetLast(); // String should end with this sep= yyGetLast(); // String should end with this
//lex->tok_start=lex->ptr-1; // Remember ' //lex->tok_start=lex->ptr-1; // Remember '
@ -217,8 +218,8 @@ static char *get_text(LEX *lex)
c = yyGet(); c = yyGet();
#ifdef USE_MB #ifdef USE_MB
int l; int l;
if (use_mb(system_charset_info) && if (use_mb(cs) &&
(l = my_ismbchar(system_charset_info, (l = my_ismbchar(cs,
(const char *)lex->ptr-1, (const char *)lex->ptr-1,
(const char *)lex->end_of_query))) { (const char *)lex->end_of_query))) {
lex->ptr += l-1; lex->ptr += l-1;
@ -262,8 +263,8 @@ static char *get_text(LEX *lex)
{ {
#ifdef USE_MB #ifdef USE_MB
int l; int l;
if (use_mb(system_charset_info) && if (use_mb(cs) &&
(l = my_ismbchar(system_charset_info, (l = my_ismbchar(cs,
(const char *)str, (const char *)end))) { (const char *)str, (const char *)end))) {
while (l--) while (l--)
*to++ = *str++; *to++ = *str++;