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
commit8dafd2b95d443e27100baed3d2df06ce9a7c3f7a (patch)
treeece449dd3151f9b8e3fa29e8990f9517b6638ac5 /server-tools
parentd1968ad43f9256f0007eec6c2375a493464e745c (diff)
parent52989c445f51f981e8d28842a022e82ac5faab8b (diff)
downloadmariadb-git-8dafd2b95d443e27100baed3d2df06ce9a7c3f7a.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;