diff options
| author | Igor Babaev <igor@askmonty.org> | 2011-11-06 13:44:59 -0800 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2011-11-06 13:44:59 -0800 |
| commit | e0500dbc3ac99fc366982f721418fb67c1961cde (patch) | |
| tree | b0f3b14e639e12cc17fb25e0544dfe06ac536d5c /storage | |
| parent | e0c1b3f24246d22e6785315f9a8448bd9a590422 (diff) | |
| parent | ff92a3af8bf262447e5ccee3e6929c4088ccbedc (diff) | |
| download | mariadb-git-e0500dbc3ac99fc366982f721418fb67c1961cde.tar.gz | |
Merge.
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/maria/ma_loghandler.c | 4 | ||||
| -rw-r--r-- | storage/myisam/mi_dbug.c | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/storage/maria/ma_loghandler.c b/storage/maria/ma_loghandler.c index 9957d755a7f..d54b0ed430f 100644 --- a/storage/maria/ma_loghandler.c +++ b/storage/maria/ma_loghandler.c @@ -2611,11 +2611,11 @@ static my_bool translog_buffer_flush(struct st_translog_buffer *buffer) i < buffer->size; i+= TRANSLOG_PAGE_SIZE, pg++) { - TRANSLOG_ADDRESS addr= (buffer->offset + i); DBUG_PRINT("info", ("send log form %lu till %lu address: (%lu,0x%lx) " "page #: %lu buffer size: %lu buffer: 0x%lx", (ulong) i, (ulong) (i + TRANSLOG_PAGE_SIZE), - LSN_IN_PARTS(addr), (ulong) pg, (ulong) buffer->size, + LSN_IN_PARTS(buffer->offset + i), (ulong) pg, + (ulong) buffer->size, (ulong) buffer)); DBUG_ASSERT(log_descriptor.pagecache->block_size == TRANSLOG_PAGE_SIZE); DBUG_ASSERT(i + TRANSLOG_PAGE_SIZE <= buffer->size); diff --git a/storage/myisam/mi_dbug.c b/storage/myisam/mi_dbug.c index ab85ece07ab..76d5d13fc5b 100644 --- a/storage/myisam/mi_dbug.c +++ b/storage/myisam/mi_dbug.c @@ -173,6 +173,7 @@ my_bool check_table_is_closed(const char *name, const char *where) DBUG_ENTER("check_table_is_closed"); (void) fn_format(filename,name,"",MI_NAME_IEXT,4+16+32); + pthread_mutex_lock(&THR_LOCK_myisam); for (pos=myisam_open_list ; pos ; pos=pos->next) { MI_INFO *info=(MI_INFO*) pos->data; @@ -183,10 +184,12 @@ my_bool check_table_is_closed(const char *name, const char *where) { fprintf(stderr,"Warning: Table: %s is open on %s\n", name,where); DBUG_PRINT("warning",("Table: %s is open on %s", name,where)); + pthread_mutex_unlock(&THR_LOCK_myisam); DBUG_RETURN(1); } } } + pthread_mutex_unlock(&THR_LOCK_myisam); DBUG_RETURN(0); } #endif /* EXTRA_DEBUG */ |