diff options
author | unknown <monty@donna.mysql.com> | 2000-12-08 17:04:57 +0200 |
---|---|---|
committer | unknown <monty@donna.mysql.com> | 2000-12-08 17:04:57 +0200 |
commit | 19d406d937d9b133c07acf370a5ba3c53bbc2ed7 (patch) | |
tree | b351c53cc8d10719148a114a60853aa9347782e0 /mysys/mf_iocache2.c | |
parent | 1324803d765267696b4d75b5d0a2546dc2686881 (diff) | |
download | mariadb-git-19d406d937d9b133c07acf370a5ba3c53bbc2ed7.tar.gz |
Lots of fixes for BDB tables
Change DROP TABLE to first drop the data, then the .frm file
Docs/manual.texi:
Updated TODO and Changelog
include/Makefile.am:
Portability fix
mysql-test/misc/select.res:
***MISSING WEAVE***
mysys/mf_iocache2.c:
cleanup
scripts/mysqlhotcopy.sh:
Fixed --noindices
sql-bench/Results/ATIS-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
Updated benchmarks
sql-bench/Results/RUN-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
Updated benchmarks
sql-bench/Results/alter-table-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
Updated benchmarks
sql-bench/Results/big-tables-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
Updated benchmarks
sql-bench/Results/connect-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
Updated benchmarks
sql-bench/Results/create-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
Updated benchmarks
sql-bench/Results/insert-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
Updated benchmarks
sql-bench/Results/select-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
Updated benchmarks
sql-bench/Results/wisconsin-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
Updated benchmarks
sql-bench/limits/pg.cfg:
Updated to new crash-me
sql-bench/server-cfg.sh:
Fixes for pg 7.0.2
sql/ha_berkeley.cc:
Lots of BDB table fixes
sql/ha_berkeley.h:
Lots of BDB table fixes
sql/handler.cc:
Change DROP TABLE to first drop the data, then the .frm file
sql/hostname.cc:
Fixes for empty hostnames
sql/log.cc:
Fixed transaction logging
sql/share/swedish/errmsg.OLD:
cleanup
sql/sql_delete.cc:
Fixes for logging
sql/sql_insert.cc:
Fixes for logging
sql/sql_select.cc:
Fixes for BDB tables
sql/sql_table.cc:
Change DROP TABLE to first drop the data, then the .frm file
sql/sql_update.cc:
Fixes for logging
BitKeeper/etc/ignore:
Added scripts/mysqld_multi to the ignore list
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
Diffstat (limited to 'mysys/mf_iocache2.c')
-rw-r--r-- | mysys/mf_iocache2.c | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/mysys/mf_iocache2.c b/mysys/mf_iocache2.c index f6e686e0378..4e44a632156 100644 --- a/mysys/mf_iocache2.c +++ b/mysys/mf_iocache2.c @@ -32,20 +32,19 @@ void my_b_seek(IO_CACHE *info,my_off_t pos) { - if(info->type == READ_CACHE) - { - info->rc_pos=info->rc_end=info->buffer; - } - else if(info->type == WRITE_CACHE) - { - byte* try_rc_pos; - try_rc_pos = info->rc_pos + (pos - info->pos_in_file); - if(try_rc_pos >= info->buffer && try_rc_pos <= info->rc_end) - info->rc_pos = try_rc_pos; - else - flush_io_cache(info); - } - + if (info->type == READ_CACHE) + { + info->rc_pos=info->rc_end=info->buffer; + } + else if (info->type == WRITE_CACHE) + { + byte* try_rc_pos; + try_rc_pos = info->rc_pos + (pos - info->pos_in_file); + if (try_rc_pos >= info->buffer && try_rc_pos <= info->rc_end) + info->rc_pos = try_rc_pos; + else + flush_io_cache(info); + } info->pos_in_file=pos; info->seek_not_done=1; } |