summaryrefslogtreecommitdiff
path: root/client/mysql_upgrade.c
diff options
context:
space:
mode:
authorunknown <msvensson@pilot.blaudden>2007-04-23 13:27:55 +0200
committerunknown <msvensson@pilot.blaudden>2007-04-23 13:27:55 +0200
commit09e6e6618ffb744899d6a45ae8987412cea51cdb (patch)
treedb424b646f7a4c6037e0a2c7e94d33708a12176c /client/mysql_upgrade.c
parentf1e81f6c8d288bc723dbcf508043498f2551c285 (diff)
downloadmariadb-git-09e6e6618ffb744899d6a45ae8987412cea51cdb.tar.gz
Use a temp variable "error" for storing return code of pclose
so the WEXITSTATUS macro can "fiddle" with it as it so pleases
Diffstat (limited to 'client/mysql_upgrade.c')
-rw-r--r--client/mysql_upgrade.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/client/mysql_upgrade.c b/client/mysql_upgrade.c
index d7486327e1b..64de3d19882 100644
--- a/client/mysql_upgrade.c
+++ b/client/mysql_upgrade.c
@@ -250,6 +250,7 @@ static int run_command(char* cmd,
{
char buf[512]= {0};
FILE *res_file;
+ int error;
if (!(res_file= popen(cmd, "r")))
die("popen(\"%s\", \"r\") failed", cmd);
@@ -269,7 +270,8 @@ static int run_command(char* cmd,
}
}
- return WEXITSTATUS(pclose(res_file));
+ error= pclose(res_file);
+ return WEXITSTATUS(error);
}