auto-merge

a0acd65e · Tatjana Azundris Nuernberg · c07e905a · a7b43600 · a0acd65e · a0acd65e
Commit a0acd65e authored Feb 21, 2012 by Tatjana Azundris Nuernberg
Showing with 5 additions and 3 deletions

VERSION VERSION +1 -1

mysql-test/r/mysqld--help-notwin.result mysql-test/r/mysqld--help-notwin.result +2 -1

mysql-test/r/mysqld--help-win.result mysql-test/r/mysqld--help-win.result +2 -1

No files found.
--- a/VERSION
+++ b/VERSION
 MYSQL_VERSION_MAJOR=5
 MYSQL_VERSION_MINOR=5
-MYSQL_VERSION_PATCH=22
+MYSQL_VERSION_PATCH=23
 MYSQL_VERSION_EXTRA=
--- a/mysql-test/r/mysqld--help-notwin.result
+++ b/mysql-test/r/mysqld--help-notwin.result
@@ -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 

--- a/mysql-test/r/mysqld--help-win.result
+++ b/mysql-test/r/mysqld--help-win.result
@@ -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