diff options
| author | df@pippilotta.erinye.com <> | 2007-08-05 16:37:34 +0200 |
|---|---|---|
| committer | df@pippilotta.erinye.com <> | 2007-08-05 16:37:34 +0200 |
| commit | 17e76114c930e4a2c1c1dc5e29f3dcd4dd214b58 (patch) | |
| tree | b2f2e3b4b40c11b57b0067bfa35ae3a00215785a /sql/sql_lex.cc | |
| parent | abf489536731f878b4acbf68cccf35e65af7fa9f (diff) | |
| parent | 3b39789e4ef016d5f65c76f9dccc1f070e6e91c1 (diff) | |
| download | mariadb-git-17e76114c930e4a2c1c1dc5e29f3dcd4dd214b58.tar.gz | |
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
Diffstat (limited to 'sql/sql_lex.cc')
| -rw-r--r-- | sql/sql_lex.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index a62d8b383a5..7911da69862 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -311,10 +311,12 @@ static char *get_text(Lex_input_stream *lip) uint found_escape=0; CHARSET_INFO *cs= lip->m_thd->charset(); + lip->tok_bitmap= 0; sep= yyGetLast(); // String should end with this while (lip->ptr != lip->end_of_query) { - c = yyGet(); + c= yyGet(); + lip->tok_bitmap|= c; #ifdef USE_MB { int l; @@ -605,6 +607,7 @@ int MYSQLlex(void *arg, void *yythd) break; } yylval->lex_str.length= lip->yytoklen; + lex->text_string_is_7bit= (lip->tok_bitmap & 0x80) ? 0 : 1; return(NCHAR_STRING); case MY_LEX_IDENT_OR_HEX: @@ -926,6 +929,7 @@ int MYSQLlex(void *arg, void *yythd) break; } yylval->lex_str.length=lip->yytoklen; + lex->text_string_is_7bit= (lip->tok_bitmap & 0x80) ? 0 : 1; return(TEXT_STRING); case MY_LEX_COMMENT: // Comment |