diff options
| author | Jim Winstead <jimw@mysql.com> | 2009-04-28 11:26:31 -0700 |
|---|---|---|
| committer | Jim Winstead <jimw@mysql.com> | 2009-04-28 11:26:31 -0700 |
| commit | 23116951ae201ed4b492c186ec09817a4df6e1fa (patch) | |
| tree | ad81d1ab3b68ed91a43b16ba279e0be93af5db6a /client | |
| parent | 00916a44c7e79b198188817df30b0892b1e5527b (diff) | |
| download | mariadb-git-23116951ae201ed4b492c186ec09817a4df6e1fa.tar.gz | |
Make SSL options appear in correct place in mysql_upgrade and mysqltest
usage information. (Bug #31883)
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysql_upgrade.c | 2 | ||||
| -rw-r--r-- | client/mysqltest.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/client/mysql_upgrade.c b/client/mysql_upgrade.c index 190bb2383e9..c50f7e03c27 100644 --- a/client/mysql_upgrade.c +++ b/client/mysql_upgrade.c @@ -115,11 +115,11 @@ static struct my_option my_long_options[]= #endif {"socket", 'S', "Socket file to use for connection.", 0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, +#include <sslopt-longopts.h> {"tmpdir", 't', "Directory for temporary files", 0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, {"user", 'u', "User for login if not current user.", (uchar**) &opt_user, (uchar**) &opt_user, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, -#include <sslopt-longopts.h> {"verbose", 'v', "Display more output about the process", (uchar**) &opt_verbose, (uchar**) &opt_verbose, 0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0}, diff --git a/client/mysqltest.cc b/client/mysqltest.cc index fdd4ff141bc..fb6baa744b2 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -5665,11 +5665,11 @@ static struct my_option my_long_options[] = {"sp-protocol", OPT_SP_PROTOCOL, "Use stored procedures for select", (uchar**) &sp_protocol, (uchar**) &sp_protocol, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0}, +#include "sslopt-longopts.h" {"tail-lines", OPT_TAIL_LINES, "Number of lines of the resul to include in a failure report", (uchar**) &opt_tail_lines, (uchar**) &opt_tail_lines, 0, GET_INT, REQUIRED_ARG, 0, 0, 10000, 0, 0, 0}, -#include "sslopt-longopts.h" {"test-file", 'x', "Read test from/in this file (default stdin).", 0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, {"timer-file", 'm', "File where the timing in micro seconds is stored.", |