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 | 93c1f96f7d694afcc90d1af7f5868f9e0a5777e0 (patch) | |
| tree | 6287deffb9d29608cfbc947946f62697fc2c4c21 /mysql-test/r/comments.result | |
| parent | d44aef016cf55dd6852fe6669e309925d07b3df2 (diff) | |
| download | mariadb-git-93c1f96f7d694afcc90d1af7f5868f9e0a5777e0.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 'mysql-test/r/comments.result')
| -rw-r--r-- | mysql-test/r/comments.result | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/r/comments.result b/mysql-test/r/comments.result index 521b5c9509d..8092f789954 100644 --- a/mysql-test/r/comments.result +++ b/mysql-test/r/comments.result @@ -5,7 +5,7 @@ select 1 /* long multi line comment */; 1 1 -/* empty query */; +; Query was empty select 1 /*!32301 +1 */; 1 /*!32301 +1 @@ -25,3 +25,4 @@ select 1 # The rest of the row will be ignored ; 1 1 +/* line with only comment */; |