diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-02-15 02:49:02 +0200 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-02-15 02:49:02 +0200 |
| commit | e3f3e0fc2f921b417a3adff09bd217b12ce6fa9f (patch) | |
| tree | 6287deffb9d29608cfbc947946f62697fc2c4c21 /sql/sql_lex.cc | |
| parent | 23b58a0b251e5c65bf2400565f85eefca436a86c (diff) | |
| download | mariadb-git-e3f3e0fc2f921b417a3adff09bd217b12ce6fa9f.tar.gz | |
Fix after merge from 3.23
Docs/manual.texi:
Added section about LOAD DATA LOCAL
libmysqld/lib_sql.cc:
Remove not used option
mysql-test/r/comments.result:
Updated results
sql/sql_parse.cc:
Fix queries / second
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 a3497d23ee5..7995e7701e5 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -768,7 +768,7 @@ int yylex(void *arg) return(TEXT_STRING); case STATE_COMMENT: // Comment - lex->options|= OPTION_FOUND_COMMENT; + lex->select_lex.options|= OPTION_FOUND_COMMENT; while ((c = yyGet()) != '\n' && c) ; yyUnget(); // Safety against eof state = STATE_START; // Try again @@ -780,7 +780,7 @@ int yylex(void *arg) break; } yySkip(); // Skip '*' - lex->options|= OPTION_FOUND_COMMENT; + lex->select_lex.options|= OPTION_FOUND_COMMENT; if (yyPeek() == '!') // MySQL command in comment { ulong version=MYSQL_VERSION_ID; |