summaryrefslogtreecommitdiff
path: root/myisam
diff options
context:
space:
mode:
authorunknown <monty@hundin.mysql.fi>2001-06-01 19:38:47 +0300
committerunknown <monty@hundin.mysql.fi>2001-06-01 19:38:47 +0300
commit455b6952d60c07245d604b2f3fd7d41a63fa89ae (patch)
tree7baaa9eb6c30ec4f2e99bab83c968494d180ff6f /myisam
parent7032533d4cf4484d3e2dc214d6d982ceefbab65d (diff)
downloadmariadb-git-455b6952d60c07245d604b2f3fd7d41a63fa89ae.tar.gz
Added --skip-symlinks
Don't force repair of tables that are not closed properly. Docs/manual.texi: Added information about symbolic links. include/my_sys.h: symbolic link support myisam/mi_check.c: Don't force repair of tables that are not closed properly. myisam/myisamchk.c: Version number change. mysys/my_static.c: symbolic link support mysys/my_symlink2.c: Disabling of symbolic link support sql/mysqld.cc: Disabling of symbolic link support
Diffstat (limited to 'myisam')
-rw-r--r--myisam/mi_check.c5
-rw-r--r--myisam/myisamchk.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/myisam/mi_check.c b/myisam/mi_check.c
index 64fbafca022..c6e07445bcf 100644
--- a/myisam/mi_check.c
+++ b/myisam/mi_check.c
@@ -110,9 +110,14 @@ int chk_status(MI_CHECK *param, register MI_INFO *info)
"Table is marked as crashed");
if (share->state.open_count != (uint) (info->s->global_changed ? 1 : 0))
{
+ /* Don't count this as a real warning, as check can correct this ! */
+ uint save=param->warning_printed;
mi_check_print_warning(param,
"%d clients is using or hasn't closed the table properly",
share->state.open_count);
+ /* If this will be fixed by the check, forget the warning */
+ if (param->testflag & T_UPDATE_STATE)
+ param->warning_printed=save;
}
return 0;
}
diff --git a/myisam/myisamchk.c b/myisam/myisamchk.c
index cbdd6a26767..06d34c10659 100644
--- a/myisam/myisamchk.c
+++ b/myisam/myisamchk.c
@@ -201,7 +201,7 @@ static struct option long_options[] =
static void print_version(void)
{
- printf("%s Ver 1.45 for %s at %s\n",my_progname,SYSTEM_TYPE,
+ printf("%s Ver 1.46 for %s at %s\n",my_progname,SYSTEM_TYPE,
MACHINE_TYPE);
}