diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-02-14 18:58:24 +0200 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-02-14 18:58:24 +0200 |
| commit | 5fa6df3081eea58dbd21e24315e27d166e66d23c (patch) | |
| tree | 9f6476af645cdeb53eefe6ca4f6bc6f4ac04bf84 /sql/sql_lex.cc | |
| parent | 7bff1b0c345c6d8f334bd31f693fb9cbe69ea120 (diff) | |
| parent | 3a231663f034394fe341ebc98fa335f824fa3135 (diff) | |
| download | mariadb-git-5fa6df3081eea58dbd21e24315e27d166e66d23c.tar.gz | |
merge with 3.23.49
BitKeeper/etc/logging_ok:
auto-union
acconfig.h:
Auto merged
Docs/manual.texi:
Auto merged
client/client_priv.h:
Auto merged
include/mysql.h:
Auto merged
innobase/dict/dict0dict.c:
Auto merged
innobase/row/row0mysql.c:
Auto merged
mysql-test/t/comments.test:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/unireg.cc:
Auto merged
sql/unireg.h:
Auto merged
Diffstat (limited to 'sql/sql_lex.cc')
| -rw-r--r-- | sql/sql_lex.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index d61e47d0883..a3497d23ee5 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -768,6 +768,7 @@ int yylex(void *arg) return(TEXT_STRING); case STATE_COMMENT: // Comment + lex->options|= OPTION_FOUND_COMMENT; while ((c = yyGet()) != '\n' && c) ; yyUnget(); // Safety against eof state = STATE_START; // Try again @@ -779,6 +780,7 @@ int yylex(void *arg) break; } yySkip(); // Skip '*' + lex->options|= OPTION_FOUND_COMMENT; if (yyPeek() == '!') // MySQL command in comment { ulong version=MYSQL_VERSION_ID; |