1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00

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
This commit is contained in:
unknown
2002-02-14 18:58:24 +02:00
22 changed files with 213 additions and 61 deletions

View File

@ -5,7 +5,7 @@
select 1+2/*hello*/+3;
select 1 /* long
multi line comment */;
!$1065 /* empty query */;
!$1065 ;
select 1 /*!32301 +1 */;
select 1 /*!52301 +1 */;
select 1--1;
@ -15,3 +15,4 @@ select 1 --2
+1;
select 1 # The rest of the row will be ignored
;
/* line with only comment */;