diff options
| author | unknown <msvensson@pilot.mysql.com> | 2008-05-02 19:42:34 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.mysql.com> | 2008-05-02 19:42:34 +0200 |
| commit | 390b57f2ac568e54429a099abe1bf3a49abe3d27 (patch) | |
| tree | 995e2746501fc9ed2e5051533c475dc88ac48b4c /client/mysqltest.c | |
| parent | ca0939d57d8b891080c27bf1aa56e297213249b9 (diff) | |
| parent | 6add5be771fc955d2f22b1eb0f14596a5bac1ca0 (diff) | |
| download | mariadb-git-390b57f2ac568e54429a099abe1bf3a49abe3d27.tar.gz | |
Merge pilot.mysql.com:/data/msvensson/mysql/my50-bt-36463
into pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-bugteam
client/mysqltest.c:
Auto merged
dbug/dbug.c:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
client/mysql_upgrade.c:
SCCS merged
Diffstat (limited to 'client/mysqltest.c')
| -rw-r--r-- | client/mysqltest.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/client/mysqltest.c b/client/mysqltest.c index 0360a8e4ba9..3187265e6f0 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -1520,7 +1520,7 @@ int dyn_string_cmp(DYNAMIC_STRING* ds, const char *fname) DBUG_ENTER("dyn_string_cmp"); DBUG_PRINT("enter", ("fname: %s", fname)); - if ((fd= create_temp_file(temp_file_path, NULL, + if ((fd= create_temp_file(temp_file_path, TMPDIR, "tmp", O_CREAT | O_SHARE | O_RDWR, MYF(MY_WME))) < 0) die("Failed to create temporary file for ds"); |