diff options
| author | unknown <monty@donna.mysql.com> | 2000-11-21 03:43:34 +0200 |
|---|---|---|
| committer | unknown <monty@donna.mysql.com> | 2000-11-21 03:43:34 +0200 |
| commit | 7c881e34ef78cd541cb98738215c8f062024dbad (patch) | |
| tree | 18fdf025bea7d918e304f45384902d822f68f2f6 /myisam/mi_rnext.c | |
| parent | 675d1803db1ea6da10dda7ac05ec7800bf6a0d31 (diff) | |
| download | mariadb-git-7c881e34ef78cd541cb98738215c8f062024dbad.tar.gz | |
Fixed problem with auto-repair of MyISAM tables
Fixed bug in ISAM and MyISAM when updating from multiple-processes
Docs/manual.texi:
Updated changelog
client/mysqladmin.c:
Upgraded version number because the change of llstr() is visible
extra/perror.c:
Added new error message
include/my_base.h:
Added HA_ERR_CRASHED_ON_USAGE
isam/rnext.c:
Fixed bug when updating from multiple-processes
isam/rprev.c:
Fixed bug when updating from multiple-processes
libmysql/libmysql.c:
Fixed that mysql->options.client_flag was used properly
myisam/mi_locking.c:
Fixed bug when updating from multiple-processes
myisam/mi_open.c:
Fixed bug when updating from multiple-processes
Added HA_ERR_CRASHED_ON_USAGE
myisam/mi_rnext.c:
Fixed bug when updating from multiple-processes
myisam/mi_rprev.c:
Fixed bug when updating from multiple-processes
myisam/myisamchk.c:
Added HA_ERR_CRASHED_ON_USAGE
sql/sql_base.cc:
Fixed problem with auto-repair of MyISAM tables
sql/table.cc:
Fixed problem with auto-repair of MyISAM tables
Diffstat (limited to 'myisam/mi_rnext.c')
| -rw-r--r-- | myisam/mi_rnext.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/myisam/mi_rnext.c b/myisam/mi_rnext.c index f7e7b61d934..f297740af60 100644 --- a/myisam/mi_rnext.c +++ b/myisam/mi_rnext.c @@ -25,7 +25,7 @@ int mi_rnext(MI_INFO *info, byte *buf, int inx) { - int error; + int error,changed; uint flag; DBUG_ENTER("mi_rnext"); @@ -39,10 +39,13 @@ int mi_rnext(MI_INFO *info, byte *buf, int inx) DBUG_RETURN(my_errno); if (info->s->concurrent_insert) rw_rdlock(&info->s->key_root_lock[inx]); + changed=_mi_test_if_changed(info); if (!flag) + { error=_mi_search_first(info,info->s->keyinfo+inx, info->s->state.key_root[inx]); - else if (_mi_test_if_changed(info) == 0) + } + else if (!changed) error=_mi_search_next(info,info->s->keyinfo+inx,info->lastkey, info->lastkey_length,flag, info->s->state.key_root[inx]); |