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 /myisam/mi_open.c | |
| 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 'myisam/mi_open.c')
| -rw-r--r-- | myisam/mi_open.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/myisam/mi_open.c b/myisam/mi_open.c index cb19011fea7..942b4cee491 100644 --- a/myisam/mi_open.c +++ b/myisam/mi_open.c @@ -174,9 +174,10 @@ MI_INFO *mi_open(const char *name, int mode, uint open_flags) disk_pos=my_n_base_info_read(disk_cache+base_pos, &share->base); share->state.state_length=base_pos; - if ((open_flags & HA_OPEN_ABORT_IF_CRASHED) && + if (!(open_flags & HA_OPEN_FOR_REPAIR) && ((share->state.changed & STATE_CRASHED) || - (my_disable_locking && share->state.open_count))) + ((open_flags & HA_OPEN_ABORT_IF_CRASHED) && + (my_disable_locking && share->state.open_count)))) { DBUG_PRINT("error",("Table is marked as crashed")); my_errno=((share->state.changed & STATE_CRASHED_ON_REPAIR) ? |