diff options
| author | unknown <tim@threads.polyesthetic.msg> | 2001-05-22 16:22:12 -0400 |
|---|---|---|
| committer | unknown <tim@threads.polyesthetic.msg> | 2001-05-22 16:22:12 -0400 |
| commit | 2cc87b411f8226e8bd0ca3daa556c1e22fb295b8 (patch) | |
| tree | 26d4eb188ef1963c81fb8b86dc98cdf953561eeb /mysys | |
| parent | f58ae5e3477d5f232e4385e16ff6c8555c8d553d (diff) | |
| parent | 554724a0ebc4d35bfbd27a0ee407d845dba9facd (diff) | |
| download | mariadb-git-2cc87b411f8226e8bd0ca3daa556c1e22fb295b8.tar.gz | |
Merge work.mysql.com:/home/bk/mysql
into threads.polyesthetic.msg:/usr/local/src/my/3
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/default.c | 2 | ||||
| -rw-r--r-- | mysys/mf_keycache.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/mysys/default.c b/mysys/default.c index 6518fb5816f..cb842da0f02 100644 --- a/mysys/default.c +++ b/mysys/default.c @@ -222,7 +222,7 @@ static my_bool search_default_file(DYNAMIC_ARRAY *args, MEM_ROOT *alloc, const char *dir, const char *config_file, const char *ext, TYPELIB *group) { - char name[FN_REFLEN+10],buff[257],*ptr,*end,*value,*tmp; + char name[FN_REFLEN+10],buff[FN_REFLEN+1],*ptr,*end,*value,*tmp; FILE *fp; uint line=0; my_bool read_values=0,found_group=0; diff --git a/mysys/mf_keycache.c b/mysys/mf_keycache.c index d63ddbf3702..5b8ec96b4d1 100644 --- a/mysys/mf_keycache.c +++ b/mysys/mf_keycache.c @@ -381,7 +381,7 @@ static SEC_LINK *find_key_block(int file, my_off_t filepos, int *error) reg1 SEC_LINK *next,**start; #if !defined(DBUG_OFF) && defined(EXTRA_DEBUG) - DBUG_EXECUTE("check_keycache",test_key_cache("start of find_key_block",0);); + DBUG_EXECUTE("check_keycache2",test_key_cache("start of find_key_block",0);); #endif *error=0; @@ -459,7 +459,7 @@ static SEC_LINK *find_key_block(int file, my_off_t filepos, int *error) } _my_used_last=next; #if !defined(DBUG_OFF) && defined(EXTRA_DEBUG) - DBUG_EXECUTE("check_keycache",test_key_cache("end of find_key_block",0);); + DBUG_EXECUTE("check_keycache2",test_key_cache("end of find_key_block",0);); #endif return next; } /* find_key_block */ |