summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorgi Kodinov <Georgi.Kodinov@Oracle.com>2012-02-19 09:33:55 +0200
committerGeorgi Kodinov <Georgi.Kodinov@Oracle.com>2012-02-19 09:33:55 +0200
commita4022b0393b11088a0229cfe80cc62fc90122139 (patch)
treec93658dde3d568bd316ca3757bbf62f81b12048f
parent8868eb76a073ab9ee9969657f274e7688b85f8e9 (diff)
downloadmariadb-git-clone-5.5.22-build.tar.gz
addendum to the --builtin-innodb depreacation bug. Fixing test suite output.clone-5.5.22-build
-rw-r--r--mysql-test/r/mysqld--help-win.result3
1 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/r/mysqld--help-win.result b/mysql-test/r/mysqld--help-win.result
index d7a06c5b23e..cd7043eb59f 100644
--- 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