diff options
| author | unknown <monty@donna.mysql.com> | 2000-08-29 19:38:32 +0300 |
|---|---|---|
| committer | unknown <monty@donna.mysql.com> | 2000-08-29 19:38:32 +0300 |
| commit | 463016ee2740fa00e56039bc0b1f8122019c982a (patch) | |
| tree | 11ed770fa863e0b50af0b27d2c231817f7655ef8 /myisam | |
| parent | 3776743da299b4229fe12a36cd6a6c0f6fb6b1e6 (diff) | |
| download | mariadb-git-463016ee2740fa00e56039bc0b1f8122019c982a.tar.gz | |
Updates for release
BitKeeper/deleted/.del-mi_debug.c:
***MISSING WEAVE***
BUILD/compile-alpha-ccc:
Added thread safe libraries
Docs/manual.texi:
Added information about --log-slow-queries
Makefile.am:
Fix for thread safe libraries
client/mysql.cc:
Allow commands without ; on first line
myisam/Makefile.am:
Removed mi_debug.c
myisam/mi_check.c:
Removed compiler warnings
myisam/mi_dbug.c:
Extra debugging
myisammrg/myrg_rkey.c:
Removed compiler warnings
myisammrg/myrg_rnext.c:
Removed compiler warnings
myisammrg/myrg_rprev.c:
Removed compiler warnings
sql/mini_client.cc:
Removed compiler warnings
sql/mysqld.cc:
Updated help
sql/sql_parse.cc:
Fix permission checking for RENAME
tests/grant.pl:
Added more grant tests
tests/grant.res:
New results
Diffstat (limited to 'myisam')
| -rw-r--r-- | myisam/Makefile.am | 2 | ||||
| -rw-r--r-- | myisam/mi_check.c | 3 | ||||
| -rw-r--r-- | myisam/mi_dbug.c | 23 |
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 */ |