diff options
| author | unknown <serg@serg.mylan> | 2004-08-20 00:52:43 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2004-08-20 00:52:43 +0200 |
| commit | f16752da5f54fd00bc834834b062e5dc46aa7378 (patch) | |
| tree | 5fff92365d8baf56b0bfb2391843398321d56ee2 /mysys | |
| parent | 233a87eb6e46474c150dbddea181069c27260ab2 (diff) | |
| parent | defb3448abb68fbfac09abc674ea45329a679543 (diff) | |
| download | mariadb-git-f16752da5f54fd00bc834834b062e5dc46aa7378.tar.gz | |
merged
BitKeeper/etc/ignore:
auto-union
include/my_global.h:
Auto merged
mysys/mf_tempfile.c:
Auto merged
mysql-test/r/rpl_heap.result:
Auto merged
mysql-test/t/rpl_heap.test:
Auto merged
sql/ha_innodb.cc:
Auto merged
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/mf_tempfile.c | 4 |
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] == '\\') |