diff options
| author | unknown <iggy@alf.(none)> | 2007-10-08 22:37:07 -0400 |
|---|---|---|
| committer | unknown <iggy@alf.(none)> | 2007-10-08 22:37:07 -0400 |
| commit | 3d57d91508e52acf4d5bc4fc929b443c1efb9961 (patch) | |
| tree | 23c281fa290212f719a9fa75a8c83179f0b5eb3d /client | |
| parent | f713c1ca87625b95fbda95dbe5e997dedb089d3b (diff) | |
| parent | d58a3bcd491cae566d09982d6ecd3c494c38e94b (diff) | |
| download | mariadb-git-3d57d91508e52acf4d5bc4fc929b443c1efb9961.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into alf.(none):/src/bug28774/my51-bug28774
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysql_upgrade.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/client/mysql_upgrade.c b/client/mysql_upgrade.c index de004c8d8ba..fe2e48fdba1 100644 --- a/client/mysql_upgrade.c +++ b/client/mysql_upgrade.c @@ -467,7 +467,11 @@ static int run_query(const char *query, DYNAMIC_STRING *ds_res, if (my_write(fd, (uchar*) query, strlen(query), MYF(MY_FNABP | MY_WME))) + { + my_close(fd, MYF(0)); + my_delete(query_file_path, MYF(0)); die("Failed to write to '%s'", query_file_path); + } ret= run_tool(mysql_path, ds_res, |