diff options
| author | unknown <igor@rurik.mysql.com> | 2003-10-01 20:16:36 -0700 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2003-10-01 20:16:36 -0700 |
| commit | 7c7ee4d2f4ae29df2167b0ca0e9ab6dfd93a1c07 (patch) | |
| tree | e1116ef7faa18e25e4ea484099e4c14d6fbbf7f1 /myisam/mi_range.c | |
| parent | cce14aabfc09628b246b3bc6ba40e6d83308da4f (diff) | |
| parent | 7de7c38f2f1b678e6d1894b94dd9abe9de9d8c70 (diff) | |
| download | mariadb-git-7c7ee4d2f4ae29df2167b0ca0e9ab6dfd93a1c07.tar.gz | |
Manual merge after improving concurrency for key cache reassignment
include/myisam.h:
Auto merged
isam/isamchk.c:
Auto merged
myisam/mi_check.c:
Auto merged
myisam/mi_locking.c:
Auto merged
myisam/mi_search.c:
Auto merged
myisam/mi_write.c:
Auto merged
myisam/myisamchk.c:
Auto merged
myisam/myisamlog.c:
Auto merged
mysql-test/r/func_group.result:
Auto merged
mysys/mf_keycache.c:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/ha_myisam.h:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_test.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'myisam/mi_range.c')
| -rw-r--r-- | myisam/mi_range.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/myisam/mi_range.c b/myisam/mi_range.c index 379ffba135a..caa57ce6187 100644 --- a/myisam/mi_range.c +++ b/myisam/mi_range.c @@ -142,7 +142,7 @@ static double _mi_search_pos(register MI_INFO *info, if (pos == HA_OFFSET_ERROR) DBUG_RETURN(0.5); - if (!(buff=_mi_fetch_keypage(info,keyinfo,pos,info->buff,1))) + if (!(buff=_mi_fetch_keypage(info,keyinfo,pos,DFLT_INIT_HITS,info->buff,1))) goto err; flag=(*keyinfo->bin_search)(info,keyinfo,buff,key,key_len,nextflag, &keypos,info->lastkey, &after_key); |