diff options
| author | unknown <msvensson@pilot.(none)> | 2007-08-03 13:26:43 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.(none)> | 2007-08-03 13:26:43 +0200 |
| commit | 64107757ad9ad5d3db142723323a7cc98fd3d04e (patch) | |
| tree | 4a6ff3ca23d4f94bea547187783b50867fe7b2dd /client/mysql_upgrade.c | |
| parent | 4351b1bf045997c3d117c75d4c68609aa4081dca (diff) | |
| parent | 942cb3e1d164bbb44710bb7461524c33eb076499 (diff) | |
| download | mariadb-git-64107757ad9ad5d3db142723323a7cc98fd3d04e.tar.gz | |
Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
client/mysql_upgrade.c:
Auto merged
mysql-test/r/mysqltest.result:
Auto merged
mysql-test/t/mysqltest.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
mysql-test/r/sp.result:
Use local
client/mysqltest.c:
Manual merge
mysql-test/lib/mtr_report.pl:
Manual merge
mysql-test/mysql-test-run.pl:
Manual merge
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 504b4c95a8b..8d57d1f2b42 100644 --- a/client/mysql_upgrade.c +++ b/client/mysql_upgrade.c @@ -458,6 +458,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); } |