diff options
| author | unknown <monty@donna.mysql.com> | 2001-02-15 03:43:14 +0200 |
|---|---|---|
| committer | unknown <monty@donna.mysql.com> | 2001-02-15 03:43:14 +0200 |
| commit | 8226b37a41dece23ec3a1c5e602fe641a49191d2 (patch) | |
| tree | 48461790e73014dbea005fbd6ef8d48e83cc6f14 /myisam/mi_dynrec.c | |
| parent | e9255e42a750a6707fa9808ee8a5c37c533e4b25 (diff) | |
| download | mariadb-git-8226b37a41dece23ec3a1c5e602fe641a49191d2.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
Docs/manual.texi:
Updated information about character sets
client/mysqladmin.c:
Added missing help text
client/mysqltest.c:
Changed --replace to --replace_result to not conflict with SQL replace command
include/my_sys.h:
change errmsg -> my_errmsg (portability issue)
libmysql/errmsg.c:
change errmsg -> my_errmsg (portability issue)
myisam/mi_cache.c:
Changed seek+read to pread
myisam/mi_check.c:
Fix bug that caused myisamchk to be very slow under some specific error conditions
myisam/mi_dynrec.c:
cleanup
myisam/myisamchk.c:
Write out value of checksum
myisam/myisamdef.h:
cleanup
mysql-test/r/backup.result:
Fixed the case where backup caused different error messages
mysql-test/r/bdb.result:
Added new test case
mysql-test/r/fulltext.result:
Fix for new CREATE TABLE format
mysql-test/t/backup.test:
Use --replace_result and --send
mysql-test/t/bdb.test:
New test case
mysql-test/t/status.test:
Use --send
mysys/errors.c:
change errmsg -> my_errmsg (portability issue)
mysys/my_error.c:
change errmsg -> my_errmsg (portability issue)
mysys/typelib.c:
Only accept full type names
sql/derror.cc:
change errmsg -> my_errmsg (portability issue)
sql/ha_berkeley.cc:
Fixed bug when using key parts that could be NULL
sql/log_event.cc:
Log SET TIMESTAMP before all queries
sql/mysqlbinlog.cc:
Incremented version number
sql/mysqld.cc:
change errmsg -> my_errmsg (portability issue)
Always accept --skip-gemeni, --skip-bdb and --skip-innobase
sql/slave.cc:
cleanup
sql/sql_base.cc:
cleanup
sql/sql_db.cc:
cleanup
support-files/my-huge.cnf.sh:
Remove usage of # at end of line
support-files/my-large.cnf.sh:
Remove usage of # at end of line
support-files/my-medium.cnf.sh:
Remove usage of # at end of line
support-files/my-small.cnf.sh:
Remove usage of # at end of line
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 |