summaryrefslogtreecommitdiff
path: root/server-tools/instance-manager/options.h
diff options
context:
space:
mode:
authorunknown <petr/cps@mysql.com/owlet.local>2006-10-05 01:24:53 +0400
committerunknown <petr/cps@mysql.com/owlet.local>2006-10-05 01:24:53 +0400
commit6acdc271f21b5e1d45fe33bc0254c61761db2abd (patch)
tree36947837e96c18387654fc76977a0cb198f0fd5b /server-tools/instance-manager/options.h
parent48759d7ae9522b2dc03d058c33e8b45471263fc3 (diff)
downloadmariadb-git-6acdc271f21b5e1d45fe33bc0254c61761db2abd.tar.gz
Fix Bug #22472 IM: --socket option should be removed from Windows version
the option is useless on windows. It was removed from listing of mysqlmanager --help on Windows server-tools/instance-manager/options.cc: move socket_file_name under unix-specific define server-tools/instance-manager/options.h: move socket_file_name under unix-specific define
Diffstat (limited to 'server-tools/instance-manager/options.h')
-rw-r--r--server-tools/instance-manager/options.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/server-tools/instance-manager/options.h b/server-tools/instance-manager/options.h
index ad3458869b6..f32e106bd7a 100644
--- a/server-tools/instance-manager/options.h
+++ b/server-tools/instance-manager/options.h
@@ -36,11 +36,11 @@ struct Options
static char run_as_service; /* handle_options doesn't support bool */
static const char *user;
static const char *angel_pid_file_name;
+ static const char *socket_file_name;
#endif
static bool is_forced_default_file;
static const char *log_file_name;
static const char *pid_file_name;
- static const char *socket_file_name;
static const char *password_file_name;
static const char *default_mysqld_path;
/* the option which should be passed to process_default_option_files */