diff options
author | unknown <monty@tik.mysql.com> | 2000-10-11 00:06:37 +0300 |
---|---|---|
committer | unknown <monty@tik.mysql.com> | 2000-10-11 00:06:37 +0300 |
commit | da5366886f2c852cb05f8b9b31848d13a4816cad (patch) | |
tree | cf18eb0d045153270d68aec8884a4732e953e883 /include | |
parent | dbde9337c201b7a53357d3904c7f0ac5b046ed85 (diff) | |
download | mariadb-git-da5366886f2c852cb05f8b9b31848d13a4816cad.tar.gz |
Automatic repair of MyISAM tables + portability fixes
Docs/manual.texi:
Changes for 3.23 and change Ansi mode -> ANSI mode
include/my_base.h:
Automatic repair of MyISAM tables
include/myisam.h:
Automatic repair of MyISAM tables
myisam/ft_update.c:
Portability fix
myisam/mi_check.c:
Automatic repair of MyISAM tables
myisam/mi_open.c:
Automatic repair of MyISAM tables
myisam/myisamchk.c:
Allow one to combine check with --old-repair
myisam/sort.c:
Fix for usage of IO_CACHE
mysys/charset.c:
Portability fixes
mysys/default.c:
Added --defaults-extra-dir
mysys/mf_tempfile.c:
Portability fixes
mysys/my_init.c:
Remove compiler warning
mysys/my_pread.c:
Remove compiler warning
sql-bench/server-cfg.sh:
New benchmark tests
sql-bench/test-insert.sh:
New benchmark tests
sql/ha_myisam.cc:
Automatic repair of MyISAM tables
sql/ha_myisam.h:
Automatic repair of MyISAM tables
sql/handler.h:
Automatic repair of MyISAM tables
sql/lock.cc:
Add missing free
sql/log_event.cc:
Portability fixes
sql/sql_base.cc:
Automatic repair of MyISAM tables
sql/sql_select.h:
Remove compiler warning
sql/sql_table.cc:
Clean up intendent
sql/sql_yacc.yy:
New syntax for CHECK
sql/table.cc:
Automatic repair of MyISAM tables
sql/table.h:
Automatic repair of MyISAM tables
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
Diffstat (limited to 'include')
-rw-r--r-- | include/my_base.h | 1 | ||||
-rw-r--r-- | include/myisam.h | 19 |
2 files changed, 11 insertions, 9 deletions
diff --git a/include/my_base.h b/include/my_base.h index dd9dafc5fbb..033b38672d3 100644 --- a/include/my_base.h +++ b/include/my_base.h @@ -46,6 +46,7 @@ #define HA_OPEN_TMP_TABLE 4 /* Table is a temp table */ #define HA_OPEN_DELAY_KEY_WRITE 8 /* Don't update index */ #define HA_OPEN_ABORT_IF_CRASHED 16 +#define HA_OPEN_FOR_REPAIR 32 /* open even if crashed */ /* The following is parameter to ha_rkey() how to use key */ diff --git a/include/myisam.h b/include/myisam.h index 5d7ef6325db..0183098a385 100644 --- a/include/myisam.h +++ b/include/myisam.h @@ -308,22 +308,23 @@ typedef struct st_sort_info { typedef struct st_mi_check_param { + ulonglong auto_increment_value; + ulonglong max_data_file_length; + ulonglong keys_in_use; + my_off_t search_after_block; + my_off_t new_file_pos,key_file_blocks; + my_off_t keydata,totaldata,key_blocks,start_check_pos; + ha_rows total_records,total_deleted; + ha_checksum record_checksum,glob_crc; ulong use_buffers,read_buffer_length,write_buffer_length, sort_buffer_length,sort_key_blocks; uint out_flag,warning_printed,error_printed, opt_rep_quick,verbose; uint opt_sort_key,total_files,max_level; + uint testflag; uint8 language; my_bool using_global_keycache, opt_lock_memory, opt_follow_links; - uint testflag; - ha_rows total_records,total_deleted; - ulonglong auto_increment_value; - my_off_t search_after_block; - ulonglong max_data_file_length; - ulonglong keys_in_use; - my_off_t new_file_pos,key_file_blocks; - my_off_t keydata,totaldata,key_blocks,start_check_pos; - ha_checksum record_checksum,glob_crc; + my_bool retry_repair,retry_without_quick; char temp_filename[FN_REFLEN],*isam_file_name,*tmpdir; int tmpfile_createflag; myf myf_rw; |