summaryrefslogtreecommitdiff
path: root/server-tools
diff options
context:
space:
mode:
authorAlexey Botchkov <holyfoot@mysql.com>2009-04-28 14:48:54 +0500
committerAlexey Botchkov <holyfoot@mysql.com>2009-04-28 14:48:54 +0500
commitddc9a195508c35fc3f83ce58327b5fe7f09f4277 (patch)
treeece449dd3151f9b8e3fa29e8990f9517b6638ac5 /server-tools
parent620fb880d7b45f67abc3edd20aed2aca11b039cd (diff)
parentd445b215d10d1239d097d9fb362f232ec9bdb2f4 (diff)
downloadmariadb-git-ddc9a195508c35fc3f83ce58327b5fe7f09f4277.tar.gz
merging
Diffstat (limited to 'server-tools')
-rw-r--r--server-tools/instance-manager/instance_options.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/server-tools/instance-manager/instance_options.cc b/server-tools/instance-manager/instance_options.cc
index 9d88bb0e669..d495e240fb8 100644
--- a/server-tools/instance-manager/instance_options.cc
+++ b/server-tools/instance-manager/instance_options.cc
@@ -522,8 +522,7 @@ int Instance_options::add_option(const char* option)
switch (selected_options->type) {
case SAVE_WHOLE_AND_ADD:
*(selected_options->value)= tmp;
- insert_dynamic(&options_array,(gptr) &tmp);
- return 0;
+ return insert_dynamic(&options_array,(gptr) &tmp);
case SAVE_VALUE:
*(selected_options->value)= strchr(tmp, '=') + 1;
return 0;