diff options
| author | unknown <bar@bar.mysql.r18.ru> | 2003-03-13 16:23:18 +0400 |
|---|---|---|
| committer | unknown <bar@bar.mysql.r18.ru> | 2003-03-13 16:23:18 +0400 |
| commit | fa2dfa0116cdf730f90cba6107398537efccf95b (patch) | |
| tree | cba344f023e4e70b3a31bbe68e3c4a58309c480a /sql/sql_lex.cc | |
| parent | bfaa1d9a2b23e859809ec6f2c9c8303bd47b4932 (diff) | |
| download | mariadb-git-fa2dfa0116cdf730f90cba6107398537efccf95b.tar.gz | |
sql_lex.cc:
Move all charset recoding to the same place
sql/sql_lex.cc:
Move all charset recoding to the same place
Diffstat (limited to 'sql/sql_lex.cc')
| -rw-r--r-- | sql/sql_lex.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index 94c06d41634..9df94204644 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 |