Skip to content

M
mariadb
Commit 3d5286d7 authored by bar@bar.mysql.r18.ru's avatar bar@bar.mysql.r18.ru
Browse files
Options

sql_lex.cc: 

  Move all charset recoding to the same place
parent b4c8ecd8
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
sql/sql_lex.cc
View file @ 3d5286d7
...@@ -359,8 +359,6 @@ static char *get_text(LEX *lex) ...@@ -359,8 +359,6 @@ static char *get_text(LEX *lex)
*to=0; *to=0;
lex->yytoklen=(uint) (to-start); lex->yytoklen=(uint) (to-start);
} }
if (lex->convert_set)
lex->convert_set->convert((char*) start,lex->yytoklen);
return (char*) start; return (char*) start;
} }
} }
...@@ -849,6 +847,8 @@ int yylex(void *arg, void *yythd) ...@@ -849,6 +847,8 @@ int yylex(void *arg, void *yythd)
break; break;
} }
yylval->lex_str.length=lex->yytoklen; yylval->lex_str.length=lex->yytoklen;
if (lex->convert_set)
lex->convert_set->convert((char*) yylval->lex_str.str,lex->yytoklen);
return(TEXT_STRING); return(TEXT_STRING);
case STATE_COMMENT: // Comment case STATE_COMMENT: // Comment
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7