diff options
| author | unknown <bell@sanja.is.com.ua> | 2004-02-14 13:06:04 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2004-02-14 13:06:04 +0200 |
| commit | 47e4ca7bec545fbb74d8c942d58c1819ab4ce2a9 (patch) | |
| tree | a20532d17fb10b1a87035cf6c5f2bc4bb326a494 /sql/sql_lex.cc | |
| parent | 69f988418c3d32e332141d7c809f7ac24dab808f (diff) | |
| parent | 4ec12a5e55d5f2db27a5c0ce93c7e74254d652a4 (diff) | |
| download | mariadb-git-47e4ca7bec545fbb74d8c942d58c1819ab4ce2a9.tar.gz | |
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-limit-4.1
sql/sql_lex.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/sql_lex.cc')
| -rw-r--r-- | sql/sql_lex.cc | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index f10ddd89f35..5ffe8c1c365 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -694,10 +694,9 @@ int yylex(void *arg, void *yythd) char quote_char= c; // Used char lex->tok_start=lex->ptr; // Skip first ` while ((c=yyGet())) - { -#ifdef USE_MB - if (my_mbcharlen(cs, c) == 1) -#endif + { + int l; + if ((l= my_mbcharlen(cs, c)) == 1) { if (c == (uchar) NAMES_SEP_CHAR) break; /* Old .frm format can't handle this char */ @@ -711,15 +710,12 @@ int yylex(void *arg, void *yythd) } } #ifdef USE_MB - else + else if (l > 1) { - int l; - if ((l = my_ismbchar(cs, - (const char *)lex->ptr-1, - (const char *)lex->end_of_query)) == 0) - break; lex->ptr += l-1; } + else + break; #endif } if (double_quotes) |