mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 12:32:27 +01:00
sql_lex.cc:
Move all charset recoding to the same place sql/sql_lex.cc: Move all charset recoding to the same place
This commit is contained in:
parent
bfaa1d9a2b
commit
fa2dfa0116
1 changed files with 2 additions and 2 deletions
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue