Merge alf.(none):/src/bug28774/my50-bug28774

into alf.(none):/src/bug28774/my51-bug28774

Merge alf.(none):/src/bug28774/my50-bug28774
into alf.(none):/src/bug28774/my51-bug28774
c9a19e54 · iggy@alf.(none) · 6a7947b8 · 19107288 · c9a19e54
Commit c9a19e54 authored Oct 08, 2007 by iggy@alf.(none)
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

client/mysql_upgrade.c client/mysql_upgrade.c +4 -0

No files found.
--- 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,