diff options
Diffstat (limited to 'client/mysqlimport.c')
-rw-r--r-- | client/mysqlimport.c | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/client/mysqlimport.c b/client/mysqlimport.c index c7432992d45..2e4e8550fe3 100644 --- a/client/mysqlimport.c +++ b/client/mysqlimport.c @@ -65,10 +65,6 @@ static longlong opt_ignore_lines= -1; static char **argv_to_free; -#ifdef HAVE_SMEM -static char *shared_memory_base_name=0; -#endif - static struct my_option my_long_options[] = { {"character-sets-dir", OPT_CHARSETS_DIR, @@ -157,15 +153,10 @@ static struct my_option my_long_options[] = &opt_mysql_port, &opt_mysql_port, 0, GET_UINT, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, - {"protocol", OPT_MYSQL_PROTOCOL, "The protocol to use for connection (tcp, socket, pipe, memory).", + {"protocol", OPT_MYSQL_PROTOCOL, "The protocol to use for connection (tcp, socket, pipe).", 0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, {"replace", 'r', "If duplicate unique key was found, replace old row.", &replace, &replace, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0}, -#ifdef HAVE_SMEM - {"shared-memory-base-name", OPT_SHARED_MEMORY_BASE_NAME, - "Base name of shared memory.", &shared_memory_base_name, &shared_memory_base_name, - 0, GET_STR_ALLOC, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, -#endif {"silent", 's', "Be more silent.", &silent, &silent, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0}, {"socket", 'S', "The socket file to use for connection.", @@ -458,10 +449,6 @@ static MYSQL *db_connect(char *host, char *database, #endif if (opt_protocol) mysql_options(mysql,MYSQL_OPT_PROTOCOL,(char*)&opt_protocol); -#ifdef HAVE_SMEM - if (shared_memory_base_name) - mysql_options(mysql,MYSQL_SHARED_MEMORY_BASE_NAME,shared_memory_base_name); -#endif if (opt_plugin_dir && *opt_plugin_dir) mysql_options(mysql, MYSQL_PLUGIN_DIR, opt_plugin_dir); @@ -514,9 +501,6 @@ static void safe_exit(int error, MYSQL *mysql) if (mysql) mysql_close(mysql); -#ifdef HAVE_SMEM - my_free(shared_memory_base_name); -#endif free_defaults(argv_to_free); mysql_library_end(); my_free(opt_password); |