summaryrefslogtreecommitdiff
path: root/sql/ha_innodb.cc
diff options
context:
space:
mode:
authorunknown <stewart@mysql.com>2005-02-17 11:45:13 +1100
committerunknown <stewart@mysql.com>2005-02-17 11:45:13 +1100
commit9fcbd39e786a670afa8ecb1ea2e59164c7c6719c (patch)
tree21b42018513e2f65c8c163b7e2b25207370491e0 /sql/ha_innodb.cc
parent9475d22a47c77861a53c25b2046290c78adc0351 (diff)
parentde5fa1dc3396dee1bf5fba06bcbd2b482946bcae (diff)
downloadmariadb-git-9fcbd39e786a670afa8ecb1ea2e59164c7c6719c.tar.gz
Merge mysql.com:/home/stewart/Documents/MySQL/5.0/ndb
into mysql.com:/home/stewart/Documents/MySQL/5.0/ndb-dynamic-ports
Diffstat (limited to 'sql/ha_innodb.cc')
-rw-r--r--sql/ha_innodb.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc
index e36fed9b283..bdf11e98a09 100644
--- a/sql/ha_innodb.cc
+++ b/sql/ha_innodb.cc
@@ -602,7 +602,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 |