diff options
| author | monty@donna.mysql.com <> | 2001-02-15 03:43:14 +0200 |
|---|---|---|
| committer | monty@donna.mysql.com <> | 2001-02-15 03:43:14 +0200 |
| commit | 450d98e3418fc3e267833d3ad13d45b539269fac (patch) | |
| tree | 48461790e73014dbea005fbd6ef8d48e83cc6f14 /myisam/mi_dynrec.c | |
| parent | 7de40020d7684af7ec139455ca99ce6480f434e0 (diff) | |
| download | mariadb-git-450d98e3418fc3e267833d3ad13d45b539269fac.tar.gz | |
Changed --replace to --replace_result in mysqltest
Changed errmsg -> my_errmsg (portability issue)
Fixed that mysqlbinlog writes SET TIMESTAMP before all queries
Fixed comments in default my.cnf files
Diffstat (limited to 'myisam/mi_dynrec.c')
| -rw-r--r-- | myisam/mi_dynrec.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/myisam/mi_dynrec.c b/myisam/mi_dynrec.c index 789831db810..4c05f6c737d 100644 --- a/myisam/mi_dynrec.c +++ b/myisam/mi_dynrec.c @@ -1294,8 +1294,9 @@ int _mi_read_rnd_dynamic_record(MI_INFO *info, byte *buf, if (info->opt_flag & READ_CACHE_USED) { if (_mi_read_cache(&info->rec_cache,(byte*) block_info.header,filepos, - sizeof(block_info.header), - test(!flag && skipp_deleted_blocks) | 2)) + sizeof(block_info.header), + (!flag && skipp_deleted_blocks ? READING_NEXT : 0) | + READING_HEADER)) goto panic; b_type=_mi_get_block_info(&block_info,-1,filepos); } @@ -1368,7 +1369,7 @@ int _mi_read_rnd_dynamic_record(MI_INFO *info, byte *buf, { if (_mi_read_cache(&info->rec_cache,(byte*) to,filepos, block_info.data_len, - test(!flag && skipp_deleted_blocks))) + (!flag && skipp_deleted_blocks) ? READING_NEXT :0)) goto panic; } else |