diff options
author | unknown <monty@donna.mysql.com> | 2000-08-18 12:48:00 +0300 |
---|---|---|
committer | unknown <monty@donna.mysql.com> | 2000-08-18 12:48:00 +0300 |
commit | 878d35fd229a1fab46c626157da504b0e4dbd3dc (patch) | |
tree | dc12a8a920e65278811e12ea88c8d7d24390be23 /myisam/mi_check.c | |
parent | c3bc8385b35246c2fae9b9cc63472926dff4ff20 (diff) | |
download | mariadb-git-878d35fd229a1fab46c626157da504b0e4dbd3dc.tar.gz |
Updated benchmark and results for PostgreSQL 7.0.2
Added more status to the MyISAM files to avoid checking files that
has already been checked.
Docs/manual.texi:
Turn off RCS flag
BitKeeper/deleted/.del-ATIS-pg-Linux_2.2.14_5.0_i686-cmp-mysql,pg:
***MISSING WEAVE***
BitKeeper/deleted/.del-RUN-pg-Linux_2.2.14_5.0_i686-cmp-mysql,pg:
***MISSING WEAVE***
BitKeeper/deleted/.del-alter-table-pg-Linux_2.2.14_5.0_i686-cmp-mysql,pg:
***MISSING WEAVE***
BitKeeper/deleted/.del-big-tables-pg-Linux_2.2.14_5.0_i686-cmp-mysql,pg:
***MISSING WEAVE***
BitKeeper/deleted/.del-connect-pg-Linux_2.2.14_5.0_i686-cmp-mysql,pg:
***MISSING WEAVE***
BitKeeper/deleted/.del-create-pg-Linux_2.2.14_5.0_i686-cmp-mysql,pg:
***MISSING WEAVE***
BitKeeper/deleted/.del-insert-pg-Linux_2.2.14_5.0_i686-cmp-mysql,pg:
***MISSING WEAVE***
BitKeeper/deleted/.del-select-pg-Linux_2.2.14_5.0_i686-cmp-mysql,pg:
***MISSING WEAVE***
BitKeeper/deleted/.del-wisconsin-pg-Linux_2.2.14_5.0_i686-cmp-mysql,pg:
***MISSING WEAVE***
BitKeeper/deleted/.del-ATIS-pg_fast-Linux_2.2.14_5.0_i686:
***MISSING WEAVE***
BitKeeper/deleted/.del-RUN-pg_fast-Linux_2.2.14_5.0_i686:
***MISSING WEAVE***
BitKeeper/deleted/.del-alter-table-pg_fast-Linux_2.2.14_5.0_i686:
***MISSING WEAVE***
BitKeeper/deleted/.del-big-tables-pg_fast-Linux_2.2.14_5.0_i686:
***MISSING WEAVE***
BitKeeper/deleted/.del-connect-pg_fast-Linux_2.2.14_5.0_i686:
***MISSING WEAVE***
BitKeeper/deleted/.del-create-pg_fast-Linux_2.2.14_5.0_i686:
***MISSING WEAVE***
BitKeeper/deleted/.del-insert-pg_fast-Linux_2.2.14_5.0_i686:
***MISSING WEAVE***
BitKeeper/deleted/.del-select-pg_fast-Linux_2.2.14_5.0_i686:
***MISSING WEAVE***
BitKeeper/deleted/.del-wisconsin-pg_fast-Linux_2.2.14_5.0_i686:
***MISSING WEAVE***
BitKeeper/deleted/.del-ATIS-pg_fast-Linux_2.2.14_5.0_i686-cmp-mysql,pg:
***MISSING WEAVE***
BitKeeper/deleted/.del-RUN-pg_fast-Linux_2.2.14_5.0_i686-cmp-mysql,pg:
***MISSING WEAVE***
BitKeeper/deleted/.del-alter-table-pg_fast-Linux_2.2.14_5.0_i686-cmp-mysql,pg:
***MISSING WEAVE***
BitKeeper/deleted/.del-big-tables-pg_fast-Linux_2.2.14_5.0_i686-cmp-mysql,pg:
***MISSING WEAVE***
BitKeeper/deleted/.del-connect-pg_fast-Linux_2.2.14_5.0_i686-cmp-mysql,pg:
***MISSING WEAVE***
BitKeeper/deleted/.del-create-pg_fast-Linux_2.2.14_5.0_i686-cmp-mysql,pg:
***MISSING WEAVE***
BitKeeper/deleted/.del-insert-pg_fast-Linux_2.2.14_5.0_i686-cmp-mysql,pg:
***MISSING WEAVE***
BitKeeper/deleted/.del-select-pg_fast-Linux_2.2.14_5.0_i686-cmp-mysql,pg:
***MISSING WEAVE***
BitKeeper/deleted/.del-wisconsin-pg_fast-Linux_2.2.14_5.0_i686-cmp-mysql,pg:
***MISSING WEAVE***
BitKeeper/deleted/.del-ATIS-mysql-Linux_2.2.14_5.0_i686-cmp-mysql,pg:
***MISSING WEAVE***
BitKeeper/deleted/.del-ATIS-mysql_fast-Linux_2.2.14_5.0_i686-cmp-mysql,pg:
***MISSING WEAVE***
BitKeeper/deleted/.del-RUN-mysql-Linux_2.2.14_5.0_i686-cmp-mysql,pg:
***MISSING WEAVE***
BitKeeper/deleted/.del-RUN-mysql_fast-Linux_2.2.14_5.0_i686-cmp-mysql,pg:
***MISSING WEAVE***
BitKeeper/deleted/.del-alter-table-mysql-Linux_2.2.14_5.0_i686-cmp-mysql,pg:
***MISSING WEAVE***
BitKeeper/deleted/.del-alter-table-mysql_fast-Linux_2.2.14_5.0_i686-cmp-mysql,pg:
***MISSING WEAVE***
BitKeeper/deleted/.del-big-tables-mysql-Linux_2.2.14_5.0_i686-cmp-mysql,pg:
***MISSING WEAVE***
BitKeeper/deleted/.del-big-tables-mysql_fast-Linux_2.2.14_5.0_i686-cmp-mysql,pg:
***MISSING WEAVE***
BitKeeper/deleted/.del-connect-mysql-Linux_2.2.14_5.0_i686-cmp-mysql,pg:
***MISSING WEAVE***
BitKeeper/deleted/.del-connect-mysql_fast-Linux_2.2.14_5.0_i686-cmp-mysql,pg:
***MISSING WEAVE***
BitKeeper/deleted/.del-create-mysql-Linux_2.2.14_5.0_i686-cmp-mysql,pg:
***MISSING WEAVE***
BitKeeper/deleted/.del-create-mysql_fast-Linux_2.2.14_5.0_i686-cmp-mysql,pg:
***MISSING WEAVE***
BitKeeper/deleted/.del-insert-mysql-Linux_2.2.14_5.0_i686-cmp-mysql,pg:
***MISSING WEAVE***
BitKeeper/deleted/.del-insert-mysql_fast-Linux_2.2.14_5.0_i686-cmp-mysql,pg:
***MISSING WEAVE***
BitKeeper/deleted/.del-select-mysql-Linux_2.2.14_5.0_i686-cmp-mysql,pg:
***MISSING WEAVE***
BitKeeper/deleted/.del-select-mysql_fast-Linux_2.2.14_5.0_i686-cmp-mysql,pg:
***MISSING WEAVE***
BitKeeper/deleted/.del-wisconsin-mysql-Linux_2.2.14_5.0_i686-cmp-mysql,pg:
***MISSING WEAVE***
BitKeeper/deleted/.del-wisconsin-mysql_fast-Linux_2.2.14_5.0_i686-cmp-mysql,pg:
***MISSING WEAVE***
dbug/Makefile.am:
Fix for bitkeeper
extra/Makefile.am:
Fix for bitkeeper
heap/Makefile.am:
Fix for bitkeeper
isam/Makefile.am:
Fix for bitkeeper
merge/Makefile.am:
Fix for bitkeeper
myisam/ChangeLog:
Added more status for the MyISAM table
myisam/Makefile.am:
Fix for bitkeeper
myisam/mi_check.c:
Added more status for the MyISAM table
myisam/mi_extra.c:
Added more status for the MyISAM table
myisam/mi_page.c:
Added more status for the MyISAM table
myisam/myisamchk.c:
Added more status for the MyISAM table
myisammrg/Makefile.am:
Fix for bitkeeper
mysys/Makefile.am:
Fix for bitkeeper
readline/Makefile.am:
Fix for bitkeeper
regex/Makefile.am:
Fix for bitkeeper
scripts/Makefile.am:
Fix for bitkeeper
sql-bench/Comments/Access.crash-me:
Comments for crash-me
sql-bench/Comments/Adabas.crash-me:
Comments for crash-me
sql-bench/Comments/Empress.crash-me:
Comments for crash-me
sql-bench/Comments/Informix.crash-me:
Comments for crash-me
sql-bench/Comments/postgres.benchmark:
Updated documentation
sql-bench/Comments/postgres.crash-me:
Comments for crash-me
sql-bench/Makefile.am:
Added the Comments directory
sql-bench/Results/ATIS-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
Version number fix
sql-bench/Results/ATIS-pg_fast-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
Version number fix
sql-bench/Results/RUN-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
Version number fix
sql-bench/Results/RUN-pg_fast-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
Version number fix
sql-bench/Results/alter-table-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
Version number fix
sql-bench/Results/alter-table-pg_fast-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
Version number fix
sql-bench/Results/big-tables-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
Version number fix
sql-bench/Results/big-tables-pg_fast-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
Version number fix
sql-bench/Results/connect-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
Version number fix
sql-bench/Results/connect-pg_fast-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
Version number fix
sql-bench/Results/create-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
Version number fix
sql-bench/Results/create-pg_fast-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
Version number fix
sql-bench/Results/insert-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
Version number fix
sql-bench/Results/insert-pg_fast-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
Version number fix
sql-bench/Results/select-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
Version number fix
sql-bench/Results/select-pg_fast-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
Version number fix
sql-bench/Results/wisconsin-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
Version number fix
sql-bench/Results/wisconsin-pg_fast-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
Version number fix
sql-bench/compare-results.sh:
Fix bug in --relative
sql-bench/test-insert.sh:
Fix for duplicate key test
sql/ha_myisam.cc:
Don't check checked tables
sql/lex.h:
Remove MAX as a reserved keyword
sql/sql_yacc.yy:
Remove MAX as a reserved keyword
strings/Makefile.am:
Fix for bitkeeper
support-files/Makefile.am:
Fix for bitkeeper
tests/Makefile.am:
Fix for bitkeeper
vio/Makefile.am:
Fix for bitkeeper
Diffstat (limited to 'myisam/mi_check.c')
-rw-r--r-- | myisam/mi_check.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/myisam/mi_check.c b/myisam/mi_check.c index 50225cd71cb..bf9891ae7f8 100644 --- a/myisam/mi_check.c +++ b/myisam/mi_check.c @@ -1055,7 +1055,8 @@ int mi_repair(MI_CHECK *param, register MI_INFO *info, DBUG_ENTER("mi_repair"); start_records=info->state->records; - new_header_length=(param->testflag & T_UNPACK) ? 0L : share->pack.header_length; + new_header_length=(param->testflag & T_UNPACK) ? 0L : + share->pack.header_length; got_error=1; new_file= -1; if (!(param->testflag & T_SILENT)) @@ -1252,8 +1253,9 @@ err: share->pack.header_length=0; share->data_file_type=sort_info->new_data_file_type; } + share->state.changed|=STATE_NOT_OPTIMIZED_KEYS | STATE_NOT_SORTED_PAGES; DBUG_RETURN(got_error); -} /* rep */ +} /* Uppate keyfile when doing repair */ @@ -1431,6 +1433,7 @@ int mi_sort_index(MI_CHECK *param, register MI_INFO *info, my_string name) for (key=0 ; key < info->s->state.header.max_block_size ; key++) info->s->state.key_del[key]= HA_OFFSET_ERROR; + info->s->state.changed&= ~STATE_NOT_SORTED_PAGES; DBUG_RETURN(0); err: @@ -1879,6 +1882,10 @@ err: mi_mark_crashed_on_repair(info); info->update|= HA_STATE_CHANGED; } + else if (key_map == share->state.key_map) + share->state.changed&= ~STATE_NOT_OPTIMIZED_KEYS; + share->state.changed|=STATE_NOT_SORTED_PAGES; + my_free((gptr) sort_info->key_block,MYF(MY_ALLOW_ZERO_PTR)); my_free(sort_info->record,MYF(MY_ALLOW_ZERO_PTR)); my_free(sort_info->buff,MYF(MY_ALLOW_ZERO_PTR)); @@ -1891,7 +1898,7 @@ err: share->pack.header_length=0; } DBUG_RETURN(got_error); -} /* rep_by_sort */ +} /* Read next record and return next key */ @@ -2813,6 +2820,7 @@ int update_state_info(MI_CHECK *param, MI_INFO *info,uint update) memcpy((char*) share->state.rec_per_key_part, (char*) param->rec_per_key_part, sizeof(*param->rec_per_key_part)*key_parts); + share->state.changed&= ~STATE_NOT_ANALYZED; } if (update & (UPDATE_STAT | UPDATE_SORT | UPDATE_TIME | UPDATE_AUTO_INC)) { |