diff options
| author | unknown <marko@hundin.mysql.fi> | 2005-02-15 16:12:51 +0200 |
|---|---|---|
| committer | unknown <marko@hundin.mysql.fi> | 2005-02-15 16:12:51 +0200 |
| commit | 6e45648e074f0856170bd13806d4e025536a2ebf (patch) | |
| tree | 844119661503bd730b28eebabe7323efbce39425 /sql/ha_innodb.cc | |
| parent | da7f5e8c4bb61f96b2fdf8e1a6989fe8e925b126 (diff) | |
| parent | c7b5773551ba41abda521f1b6e592258252431ee (diff) | |
| download | mariadb-git-6e45648e074f0856170bd13806d4e025536a2ebf.tar.gz | |
Merge hundin.mysql.fi:/home/marko/k/mysql-4.0
into hundin.mysql.fi:/home/marko/mysql-4.1
sql/ha_innodb.cc:
Auto merged
Diffstat (limited to 'sql/ha_innodb.cc')
| -rw-r--r-- | sql/ha_innodb.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc index 702139624ff..4f32bb08e9a 100644 --- a/sql/ha_innodb.cc +++ b/sql/ha_innodb.cc @@ -472,7 +472,7 @@ innobase_mysql_tmpfile(void) { char filename[FN_REFLEN]; int fd2 = -1; - File fd = create_temp_file(filename, NullS, "ib", + File fd = create_temp_file(filename, mysql_tmpdir, "ib", #ifdef __WIN__ O_BINARY | O_TRUNC | O_SEQUENTIAL | O_TEMPORARY | O_SHORT_LIVED | |