Commit 6e45648e authored by unknown's avatar unknown
Browse files

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
parents da7f5e8c c7b57735

sql/ha_innodb.cc

+1 −1
Original line number Diff line number Diff line
@@ -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 |