diff options
| author | monty@mysql.com <> | 2004-12-31 03:47:56 +0200 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-12-31 03:47:56 +0200 |
| commit | 5e03ebbcad59ec472af59ce9973bfefcddfe056f (patch) | |
| tree | dd3c89af5e01f80d9172adc65e8df542cd91cb5b /myisam/mi_range.c | |
| parent | 34d5331cee44cdcb62245779ad486ccbef6bf4c2 (diff) | |
| download | mariadb-git-5e03ebbcad59ec472af59ce9973bfefcddfe056f.tar.gz | |
After merge fixes
Cleanup of mi_print_error() handling
Deleted 'merge' directory
Diffstat (limited to 'myisam/mi_range.c')
| -rw-r--r-- | myisam/mi_range.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/myisam/mi_range.c b/myisam/mi_range.c index 0d8f8763b92..e78f3b11625 100644 --- a/myisam/mi_range.c +++ b/myisam/mi_range.c @@ -213,7 +213,8 @@ err: /* Get keynummer of current key and max number of keys in nod */ -static uint _mi_keynr(MI_INFO *info, register MI_KEYDEF *keyinfo, uchar *page, uchar *keypos, uint *ret_max_key) +static uint _mi_keynr(MI_INFO *info, register MI_KEYDEF *keyinfo, uchar *page, + uchar *keypos, uint *ret_max_key) { uint nod_flag,keynr,max_key; uchar t_buff[MI_MAX_KEY_BUFF],*end; @@ -222,7 +223,7 @@ static uint _mi_keynr(MI_INFO *info, register MI_KEYDEF *keyinfo, uchar *page, u nod_flag=mi_test_if_nod(page); page+=2+nod_flag; - if (!(keyinfo->flag & (HA_VAR_LENGTH_KEY| HA_BINARY_PACK_KEY))) + if (!(keyinfo->flag & (HA_VAR_LENGTH_KEY | HA_BINARY_PACK_KEY))) { *ret_max_key= (uint) (end-page)/(keyinfo->keylength+nod_flag); return (uint) (keypos-page)/(keyinfo->keylength+nod_flag); @@ -233,11 +234,7 @@ static uint _mi_keynr(MI_INFO *info, register MI_KEYDEF *keyinfo, uchar *page, u while (page < end) { if (!(*keyinfo->get_key)(keyinfo,nod_flag,&page,t_buff)) - { - if (my_errno == HA_ERR_CRASHED) - mi_print_error(info, HA_ERR_CRASHED); return 0; /* Error */ - } max_key++; if (page == keypos) keynr=max_key; |