summaryrefslogtreecommitdiff
path: root/mysys
diff options
context:
space:
mode:
authorserg@serg.mylan <>2004-08-20 00:52:43 +0200
committerserg@serg.mylan <>2004-08-20 00:52:43 +0200
commit62722e7b0528a97ef0b5831cb27c1acfd4d5e856 (patch)
tree5fff92365d8baf56b0bfb2391843398321d56ee2 /mysys
parent22546845f2651074cff2d48aa708365f40c1cfa9 (diff)
parent068a57b12c46b15dd9e8192fe0fb0def468eb5ab (diff)
downloadmariadb-git-62722e7b0528a97ef0b5831cb27c1acfd4d5e856.tar.gz
merged
Diffstat (limited to 'mysys')
-rw-r--r--mysys/mf_tempfile.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysys/mf_tempfile.c b/mysys/mf_tempfile.c
index 0b337a74c19..af9ff0d6711 100644
--- a/mysys/mf_tempfile.c
+++ b/mysys/mf_tempfile.c
@@ -98,7 +98,7 @@ File create_temp_file(char *to, const char *dir, const char *prefix,
if (strlen(dir)+ pfx_len > FN_REFLEN-2)
{
errno=my_errno= ENAMETOOLONG;
- return 1;
+ DBUG_RETURN(file);
}
strmov(convert_dirname(to,dir,NullS),prefix_buff);
org_file=mkstemp(to);
@@ -124,7 +124,7 @@ File create_temp_file(char *to, const char *dir, const char *prefix,
#ifdef OS2
/* changing environ variable doesn't work with VACPP */
char buffer[256], *end;
- buffer[sizeof[buffer)-1]= 0;
+ buffer[sizeof(buffer)-1]= 0;
end= strxnmov(buffer, sizeof(buffer)-1, (char*) "TMP=", dir, NullS);
/* remove ending backslash */
if (end[-1] == '\\')