diff options
| author | unknown <bar@bar.mysql.r18.ru> | 2003-03-15 15:19:06 +0400 |
|---|---|---|
| committer | unknown <bar@bar.mysql.r18.ru> | 2003-03-15 15:19:06 +0400 |
| commit | 23c774bc727f668c3663226e63b6452a95f3a851 (patch) | |
| tree | 50463ed7737ad25514f65095ae3550df2d318a28 /sql/sql_lex.cc | |
| parent | aad26453e66074dbbbcc66628a975dd135c41a53 (diff) | |
| download | mariadb-git-23c774bc727f668c3663226e63b6452a95f3a851.tar.gz | |
sql_lex.cc:
Use LEX charset instead of system one
sql/sql_lex.cc:
Use LEX charset instead of system one
Diffstat (limited to 'sql/sql_lex.cc')
| -rw-r--r-- | sql/sql_lex.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index cd0a653ba86..378aa380a3c 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -209,6 +209,7 @@ static char *get_text(LEX *lex) { reg1 uchar c,sep; uint found_escape=0; + CHARSET_INFO *cs= lex->thd->variables.thd_charset; sep= yyGetLast(); // String should end with this //lex->tok_start=lex->ptr-1; // Remember ' @@ -217,8 +218,8 @@ static char *get_text(LEX *lex) c = yyGet(); #ifdef USE_MB int l; - if (use_mb(system_charset_info) && - (l = my_ismbchar(system_charset_info, + if (use_mb(cs) && + (l = my_ismbchar(cs, (const char *)lex->ptr-1, (const char *)lex->end_of_query))) { lex->ptr += l-1; @@ -262,8 +263,8 @@ static char *get_text(LEX *lex) { #ifdef USE_MB int l; - if (use_mb(system_charset_info) && - (l = my_ismbchar(system_charset_info, + if (use_mb(cs) && + (l = my_ismbchar(cs, (const char *)str, (const char *)end))) { while (l--) *to++ = *str++; |