Merge hundin.mysql.fi:/home/marko/k/mysql-4.0

into hundin.mysql.fi:/home/marko/mysql-4.1

Merge hundin.mysql.fi:/home/marko/k/mysql-4.0
into hundin.mysql.fi:/home/marko/mysql-4.1
df0aee43 · marko@hundin.mysql.fi · 4f41de1c · c4ff2702 · df0aee43
Commit df0aee43 authored Feb 15, 2005 by marko@hundin.mysql.fi
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sql/ha_innodb.cc sql/ha_innodb.cc +1 -1

No files found.
--- 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 |