diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2018-08-20 13:06:33 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2018-08-20 14:11:36 +0100 |
| commit | ee98e95e25bc8abe2be61d3449974d8ba078b351 (patch) | |
| tree | 6c021088a795b0730ff4741ae30675401382bc4f /client/mysql_upgrade.c | |
| parent | 4299b82ad813a1ad5dfc84f02415eedfcf731bbc (diff) | |
| download | mariadb-git-ee98e95e25bc8abe2be61d3449974d8ba078b351.tar.gz | |
MDEV-16536 Remove shared memory transport
Diffstat (limited to 'client/mysql_upgrade.c')
| -rw-r--r-- | client/mysql_upgrade.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/client/mysql_upgrade.c b/client/mysql_upgrade.c index ef1630dd0e3..c5a79e24c03 100644 --- a/client/mysql_upgrade.c +++ b/client/mysql_upgrade.c @@ -135,13 +135,8 @@ static struct my_option my_long_options[]= "built-in default (" STRINGIFY_ARG(MYSQL_PORT) ").", 0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, {"protocol", OPT_MYSQL_PROTOCOL, - "The protocol to use for connection (tcp, socket, pipe, memory).", + "The protocol to use for connection (tcp, socket, pipe).", 0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, -#ifdef HAVE_SMEM - {"shared-memory-base-name", OPT_SHARED_MEMORY_BASE_NAME, - "Base name of shared memory.", 0, - 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, -#endif {"silent", OPT_SILENT, "Print less information", &opt_silent, &opt_silent, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0}, {"socket", 'S', "The socket file to use for connection.", @@ -354,7 +349,6 @@ get_one_option(int optid, const struct my_option *opt, case 'P': /* --port */ case 'S': /* --socket */ case OPT_MYSQL_PROTOCOL: /* --protocol */ - case OPT_SHARED_MEMORY_BASE_NAME: /* --shared-memory-base-name */ case OPT_PLUGIN_DIR: /* --plugin-dir */ case OPT_DEFAULT_AUTH: /* --default-auth */ add_one_option_cmd_line(&conn_args, opt, argument); |