diff options
author | unknown <monty@donna.mysql.fi> | 2001-03-06 20:38:53 +0200 |
---|---|---|
committer | unknown <monty@donna.mysql.fi> | 2001-03-06 20:38:53 +0200 |
commit | 08d7d5cf331a9f0e860792c356201ef386ceea5d (patch) | |
tree | 9613587a263dc7a069c1038873e71db018c29273 /myisam/mi_dbug.c | |
parent | a9c60a41feb2189e270c41def107d40c1f00b8b5 (diff) | |
download | mariadb-git-08d7d5cf331a9f0e860792c356201ef386ceea5d.tar.gz |
Patch from sleepycat to fix problem with BDB and log files
Print full command name to log files
Convert table type to supported onces on ALTER TABLE
Docs/manual.texi:
Updates from user comments
bdb/log/log_rec.c:
Patch from sleepycat to fix problem with log files
innobase/ibuf/Makefile.am:
Don't let make do bk get
innobase/include/Makefile.am:
Don't let make do bk get
man/Makefile.am:
Don't let make do bk get
myisam/mi_dbug.c:
Print warning to debug log
mysql-test/mysql-test-run.sh:
Don't use innobase in replica
mysql-test/r/null_key.result:
Fix for new key lengths
sql/ha_innobase.cc:
Free hash cache at end
sql/log.cc:
Print full command name to log files
sql/sql_table.cc:
Convert table type to supported onces on ALTER TABLE
Diffstat (limited to 'myisam/mi_dbug.c')
-rw-r--r-- | myisam/mi_dbug.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/myisam/mi_dbug.c b/myisam/mi_dbug.c index c424d65f7ec..eda1aafecc8 100644 --- a/myisam/mi_dbug.c +++ b/myisam/mi_dbug.c @@ -155,6 +155,7 @@ my_bool check_table_is_closed(const char *name, const char *where) { char filename[FN_REFLEN]; LIST *pos; + DBUG_ENTER("check_table_is_closed"); (void) fn_format(filename,name,"",MI_NAME_IEXT,4+16+32); for (pos=myisam_open_list ; pos ; pos=pos->next) @@ -163,10 +164,14 @@ my_bool check_table_is_closed(const char *name, const char *where) MYISAM_SHARE *share=info->s; if (!strcmp(share->filename,filename)) { - fprintf(stderr,"Warning: Table: %s is open on %s\n", name,where); - return 1; + if (share->last_version) + { + fprintf(stderr,"Warning: Table: %s is open on %s\n", name,where); + DBUG_PRINT("warning",("Table: %s is open on %s", name,where)); + DBUG_RETURN(1); + } } } - return 0; + DBUG_RETURN(0); } #endif /* EXTRA_DEBUG */ |