diff options
| author | unknown <marko@hundin.mysql.fi> | 2005-03-15 11:22:20 +0200 |
|---|---|---|
| committer | unknown <marko@hundin.mysql.fi> | 2005-03-15 11:22:20 +0200 |
| commit | 50a6be7dd43bdeeaca8cd6293a1e478794eed3be (patch) | |
| tree | 26006612ed8dc20f8814718b548010c0c6327905 | |
| parent | 01df5a157fb1b70dda18b4bdfa64e8635b930a24 (diff) | |
| parent | bcabdc22bf0aaad9b93112936ba1264070339663 (diff) | |
| download | mariadb-git-50a6be7dd43bdeeaca8cd6293a1e478794eed3be.tar.gz | |
After merge fixes
BitKeeper/etc/logging_ok:
auto-union
innobase/buf/buf0flu.c:
Manual merge
innobase/dict/dict0load.c:
Manual merge: do not refuse to open ROW_FORMAT=COMPACT tables
| -rw-r--r-- | innobase/buf/buf0flu.c | 10 | ||||
| -rw-r--r-- | innobase/dict/dict0load.c | 2 | ||||
| -rw-r--r-- | man/mysql.1.in | 2 |
3 files changed, 11 insertions, 3 deletions
diff --git a/innobase/buf/buf0flu.c b/innobase/buf/buf0flu.c index a0ca614d9b3..592ed972376 100644 --- a/innobase/buf/buf0flu.c +++ b/innobase/buf/buf0flu.c @@ -115,7 +115,15 @@ buf_flush_ready_for_replace( #ifdef UNIV_SYNC_DEBUG ut_ad(mutex_own(&(buf_pool->mutex))); #endif /* UNIV_SYNC_DEBUG */ - ut_a(block->state == BUF_BLOCK_FILE_PAGE); + if (block->state != BUF_BLOCK_FILE_PAGE) { + ut_print_timestamp(stderr); + fprintf(stderr, +" InnoDB: Error: buffer block state %lu in the LRU list!\n", + (ulong)block->state); + ut_print_buf(stderr, (byte*)block, sizeof(buf_block_t)); + + return(FALSE); + } if ((ut_dulint_cmp(block->oldest_modification, ut_dulint_zero) > 0) || (block->buf_fix_count != 0) diff --git a/innobase/dict/dict0load.c b/innobase/dict/dict0load.c index 1622ffa5454..8bf106dbf36 100644 --- a/innobase/dict/dict0load.c +++ b/innobase/dict/dict0load.c @@ -769,7 +769,7 @@ dict_load_table( /* Check if the table name in record is the searched one */ if (len != ut_strlen(name) || ut_memcmp(name, field, len) != 0) { - + err_exit: btr_pcur_close(&pcur); mtr_commit(&mtr); mem_heap_free(heap); diff --git a/man/mysql.1.in b/man/mysql.1.in index 35ff48693e1..7330ac8125b 100644 --- a/man/mysql.1.in +++ b/man/mysql.1.in @@ -107,7 +107,7 @@ version number and exit. Wait and retry if the database server connection is down. .SH FILES .TP 2.2i -.I @sysconfdir@/my.cnf +.I /etc/my.cnf MySQL configuration file .TP .I @bindir@/mysql |