diff options
author | unknown <msvensson@pilot.(none)> | 2007-08-13 11:35:10 +0200 |
---|---|---|
committer | unknown <msvensson@pilot.(none)> | 2007-08-13 11:35:10 +0200 |
commit | 0dcf2ea1d1f6f3e232c510cd79369caf4c630071 (patch) | |
tree | 4ad45c05c3b618e1b0f77ec442e59eb160229225 /client/mysql_upgrade.c | |
parent | b35cad86d43b26a2236c715645bf2737af20c890 (diff) | |
parent | 7f9883fab578234d6a8b9e0a0e6fa6bc0a29a31e (diff) | |
download | mariadb-git-0dcf2ea1d1f6f3e232c510cd79369caf4c630071.tar.gz |
Merge bk-internal:/home/bk/mysql-5.1-maint
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
client/mysql_upgrade.c:
Auto merged
client/mysqltest.c:
Auto merged
mysql-test/lib/mtr_report.pl:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/show_check.result:
Auto merged
mysql-test/t/show_check.test:
Auto merged
Diffstat (limited to 'client/mysql_upgrade.c')
-rw-r--r-- | client/mysql_upgrade.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/client/mysql_upgrade.c b/client/mysql_upgrade.c index 5da0235c913..7a36a382c97 100644 --- a/client/mysql_upgrade.c +++ b/client/mysql_upgrade.c @@ -468,6 +468,7 @@ static int run_query(const char *query, DYNAMIC_STRING *ds_res, NULL); my_close(fd, MYF(0)); + my_delete(query_file_path, MYF(0)); DBUG_RETURN(ret); } |