diff options
| author | Georgi Kodinov <joro@sun.com> | 2010-03-10 12:19:49 +0200 |
|---|---|---|
| committer | Georgi Kodinov <joro@sun.com> | 2010-03-10 12:19:49 +0200 |
| commit | 51215498a03f864a23e655dc012d943ec475ad96 (patch) | |
| tree | df7858459ef4bc18ad6a701f1113df6d15a4eb37 /client | |
| parent | a774c83c2f6936dbafbe4e1149a2305bb691f040 (diff) | |
| parent | 25a271a0f84e1ea32c46da090c2d0bde77fadbbc (diff) | |
| download | mariadb-git-51215498a03f864a23e655dc012d943ec475ad96.tar.gz | |
merge
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysql_upgrade.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/client/mysql_upgrade.c b/client/mysql_upgrade.c index 689a2c82571..ade8e30648a 100644 --- a/client/mysql_upgrade.c +++ b/client/mysql_upgrade.c @@ -44,7 +44,7 @@ static DYNAMIC_STRING conn_args; static char *opt_password= 0; static my_bool tty_password= 0; -static char opt_tmpdir[FN_REFLEN]; +static char opt_tmpdir[FN_REFLEN] = ""; #ifndef DBUG_OFF static char *default_dbug_option= (char*) "d:t:O,/tmp/mysql_upgrade.trace"; @@ -459,7 +459,8 @@ static int run_query(const char *query, DYNAMIC_STRING *ds_res, DBUG_ENTER("run_query"); DBUG_PRINT("enter", ("query: %s", query)); - if ((fd= create_temp_file(query_file_path, opt_tmpdir, + if ((fd= create_temp_file(query_file_path, + opt_tmpdir[0] ? opt_tmpdir : NULL, "sql", O_CREAT | O_SHARE | O_RDWR, MYF(MY_WME))) < 0) die("Failed to create temporary file for defaults"); |