summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <jmiller@mysql.com>2006-02-08 19:00:05 +0100
committerunknown <jmiller@mysql.com>2006-02-08 19:00:05 +0100
commit2dc19ba63c94e3dc4d79e30b9825b6ff03c05ac3 (patch)
tree504eae72686a7dbe2733da2b2a9c5a5a3ca09e0f
parentc790e290faaca22f491454fdd2a9151815b0d953 (diff)
parentc7bfa485bfcadb3e1d38fd2a87ef9bd35f9ef279 (diff)
downloadmariadb-git-2dc19ba63c94e3dc4d79e30b9825b6ff03c05ac3.tar.gz
Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
-rw-r--r--sql/sql_partition.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/sql_partition.cc b/sql/sql_partition.cc
index c6df76f2674..3d138b4e3d0 100644
--- a/sql/sql_partition.cc
+++ b/sql/sql_partition.cc
@@ -2397,7 +2397,9 @@ char *generate_partition_syntax(partition_info *part_info,
DBUG_ENTER("generate_partition_syntax");
write_part_state= (part_info->part_state && !part_info->part_state_len);
- if (unlikely(((fptr= create_temp_file(path,mysql_tmpdir,"psy", 0,0))) < 0))
+ if (unlikely(((fptr= create_temp_file(path,mysql_tmpdir,"psy",
+ O_RDWR | O_BINARY | O_TRUNC |
+ O_TEMPORARY, MYF(MY_WME)))) < 0))
DBUG_RETURN(NULL);
#ifndef __WIN__
unlink(path);