diff options
| author | unknown <mkindahl@dl145h.mysql.com> | 2007-08-03 18:59:16 +0200 |
|---|---|---|
| committer | unknown <mkindahl@dl145h.mysql.com> | 2007-08-03 18:59:16 +0200 |
| commit | 6c1edb11d44d7b4308c9d9ddb50bc41be895682d (patch) | |
| tree | 2634f506d2b962f13e24f0f80211983257503072 /sql/sql_lex.cc | |
| parent | 9687988e8368f0b09a4f07e53b7ffceb1b01b822 (diff) | |
| parent | be04bf55248cb742acc18bcbe405691edc2b7fa4 (diff) | |
| download | mariadb-git-6c1edb11d44d7b4308c9d9ddb50bc41be895682d.tar.gz | |
Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl
into dl145h.mysql.com:/data0/mkindahl/mysql-5.0-2team
mysql-test/r/func_time.result:
Auto merged
mysql-test/t/func_time.test:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
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 |