From 3d5286d7bce849ccdbdfaec9ca9482d363ed3a89 Mon Sep 17 00:00:00 2001 From: "bar@bar.mysql.r18.ru" <> Date: Thu, 13 Mar 2003 16:23:18 +0400 Subject: [PATCH] sql_lex.cc: Move all charset recoding to the same place --- sql/sql_lex.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index 94c06d4163..9df9420464 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -359,8 +359,6 @@ static char *get_text(LEX *lex) *to=0; lex->yytoklen=(uint) (to-start); } - if (lex->convert_set) - lex->convert_set->convert((char*) start,lex->yytoklen); return (char*) start; } } @@ -849,6 +847,8 @@ int yylex(void *arg, void *yythd) break; } yylval->lex_str.length=lex->yytoklen; + if (lex->convert_set) + lex->convert_set->convert((char*) yylval->lex_str.str,lex->yytoklen); return(TEXT_STRING); case STATE_COMMENT: // Comment -- 2.30.9