summaryrefslogtreecommitdiff
path: root/myisam
diff options
context:
space:
mode:
Diffstat (limited to 'myisam')
-rw-r--r--myisam/Makefile.am2
-rw-r--r--myisam/mi_check.c3
-rw-r--r--myisam/mi_dbug.c23
3 files changed, 25 insertions, 3 deletions
diff --git a/myisam/Makefile.am b/myisam/Makefile.am
index aff1b670f33..6c5767640c8 100644
--- a/myisam/Makefile.am
+++ b/myisam/Makefile.am
@@ -43,7 +43,7 @@ libmyisam_a_SOURCES = mi_open.c mi_extra.c mi_info.c mi_rkey.c \
mi_rsamepos.c mi_panic.c mi_close.c mi_create.c\
mi_range.c mi_dbug.c mi_checksum.c mi_log.c \
mi_changed.c mi_static.c mi_delete_all.c \
- mi_delete_table.c mi_rename.c mi_check.c mi_debug.c \
+ mi_delete_table.c mi_rename.c mi_check.c \
ft_parser.c ft_search.c ft_stopwords.c ft_static.c \
ft_update.c sort.c
CLEANFILES = test?.IS? isam.log mi_test_all
diff --git a/myisam/mi_check.c b/myisam/mi_check.c
index 2b5a14f1e87..ab3d986980c 100644
--- a/myisam/mi_check.c
+++ b/myisam/mi_check.c
@@ -16,8 +16,7 @@
/* Descript, check and repair of ISAM tables */
-#include "myisamdef.h"
-
+#include "fulltext.h"
#include <m_ctype.h>
#include <stdarg.h>
#include <getopt.h>
diff --git a/myisam/mi_dbug.c b/myisam/mi_dbug.c
index 62d6e039059..c424d65f7ec 100644
--- a/myisam/mi_dbug.c
+++ b/myisam/mi_dbug.c
@@ -147,3 +147,26 @@ void _mi_print_key(FILE *stream, register MI_KEYSEG *keyseg,
VOID(fputs("\"\n",stream));
return;
} /* print_key */
+
+
+#ifdef EXTRA_DEBUG
+
+my_bool check_table_is_closed(const char *name, const char *where)
+{
+ char filename[FN_REFLEN];
+ LIST *pos;
+
+ (void) fn_format(filename,name,"",MI_NAME_IEXT,4+16+32);
+ for (pos=myisam_open_list ; pos ; pos=pos->next)
+ {
+ MI_INFO *info=(MI_INFO*) pos->data;
+ MYISAM_SHARE *share=info->s;
+ if (!strcmp(share->filename,filename))
+ {
+ fprintf(stderr,"Warning: Table: %s is open on %s\n", name,where);
+ return 1;
+ }
+ }
+ return 0;
+}
+#endif /* EXTRA_DEBUG */