diff options
| author | monty@hundin.mysql.fi <> | 2001-10-31 03:22:31 +0200 |
|---|---|---|
| committer | monty@hundin.mysql.fi <> | 2001-10-31 03:22:31 +0200 |
| commit | 5a9ce774dc413ac7b6342a9097f4e2456d0df63f (patch) | |
| tree | a7cd1bf6f7f295d11ffce88081f69bc1963bfd06 /mysys/mf_cache.c | |
| parent | 7f38949c6be7dba794a786b4fe53132f7f5751e5 (diff) | |
| download | mariadb-git-5a9ce774dc413ac7b6342a9097f4e2456d0df63f.tar.gz | |
Update for OS2 (patch from Yuri Dario).
Use LONG_TIMEOUT (one year) instead of ~0 for long timeouts
Fixed error messages.
Fixed problem with const propagation when comparing columns of different types
Diffstat (limited to 'mysys/mf_cache.c')
| -rw-r--r-- | mysys/mf_cache.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysys/mf_cache.c b/mysys/mf_cache.c index ff29926ac50..8d6eda8305a 100644 --- a/mysys/mf_cache.c +++ b/mysys/mf_cache.c @@ -37,11 +37,11 @@ static my_bool cache_remove_open_tmp(IO_CACHE *cache, const char *name) #else int length; if (!(cache->file_name= - (char*) my_malloc((length=strlen(name)+1),MYF(MY_WME))) + (char*) my_malloc((length=strlen(name)+1),MYF(MY_WME)))) { my_close(cache->file,MYF(0)); cache->file = -1; - errno=my_error=ENOMEM; + errno=my_errno=ENOMEM; return 1; } memcpy(cache->file_name,name,length); |