Commit a0acd65e authored by Tatjana Azundris Nuernberg's avatar Tatjana Azundris Nuernberg

auto-merge

parents c07e905a a7b43600
MYSQL_VERSION_MAJOR=5
MYSQL_VERSION_MINOR=5
MYSQL_VERSION_PATCH=22
MYSQL_VERSION_PATCH=23
MYSQL_VERSION_EXTRA=
......@@ -175,7 +175,8 @@ The following options may be given as the first argument:
GROUP_CONCAT()
-?, --help Display this help and exit.
--ignore-builtin-innodb
Disable initialization of builtin InnoDB plugin
DEPRECATED. This option will be removed in future
releases. Disable initialization of builtin InnoDB plugin
--init-connect=name Command(s) that are executed for each new connection
--init-file=name Read SQL commands from this file at startup
--init-rpl-role=name
......
......@@ -175,7 +175,8 @@ The following options may be given as the first argument:
GROUP_CONCAT()
-?, --help Display this help and exit.
--ignore-builtin-innodb
Disable initialization of builtin InnoDB plugin
DEPRECATED. This option will be removed in future
releases. Disable initialization of builtin InnoDB plugin
--init-connect=name Command(s) that are executed for each new connection
--init-file=name Read SQL commands from this file at startup
--init-rpl-role=name
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment