diff options
author | unknown <reggie@fedora.(none)> | 2005-11-02 06:51:44 -0600 |
---|---|---|
committer | unknown <reggie@fedora.(none)> | 2005-11-02 06:51:44 -0600 |
commit | 5ce36e8134f41aed1e6dbfe585eb8e3c0ef410e5 (patch) | |
tree | 2f2590f11a36e3a803ddb5e9fa14c006a15bfea0 /server-tools/instance-manager/instance_options.cc | |
parent | 69f80875a6c6c00e434bddc117d9a239b138df44 (diff) | |
download | mariadb-git-5ce36e8134f41aed1e6dbfe585eb8e3c0ef410e5.tar.gz |
more refinement of IM patch to fix Windows pathnames with spaces
server-tools/instance-manager/instance_options.cc:
move declaration of end to start of function so gcc is happy
server-tools/instance-manager/parse_output.cc:
remove space before =
use my_isspace to determine if *end is white space
remove comments related to get_word which was removed
replace tab character with appropriate # of spaces
Diffstat (limited to 'server-tools/instance-manager/instance_options.cc')
-rw-r--r-- | server-tools/instance-manager/instance_options.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/server-tools/instance-manager/instance_options.cc b/server-tools/instance-manager/instance_options.cc index 54ad9da6ab2..b060a1328ea 100644 --- a/server-tools/instance-manager/instance_options.cc +++ b/server-tools/instance-manager/instance_options.cc @@ -334,12 +334,13 @@ int Instance_options::complete_initialization(const char *default_path, uint instance_type) { const char *tmp; + char* end; if (!mysqld_path && !(mysqld_path= strdup_root(&alloc, default_path))) goto err; // it's safe to cast this to char* since this is a buffer we are allocating - char* end= convert_dirname((char*)mysqld_path, mysqld_path, NullS); + end= convert_dirname((char*)mysqld_path, mysqld_path, NullS); end[-1]= 0; mysqld_path_len= strlen(mysqld_path); |