mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 19:11:46 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0

Browse source 
into hundin.mysql.fi:/home/marko/mysql-5.0
This commit is contained in:
marko@hundin.mysql.fi 2005-03-15 14:47:22 +02:00
commit 37905eea50
3 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
innobase/buf/buf0flu.c
View file

@ -115,7 +115,15 @@ buf_flush_ready_for_replace(
#ifdef UNIV_SYNC_DEBUG #ifdef UNIV_SYNC_DEBUG
ut_ad(mutex_own(&(buf_pool->mutex))); ut_ad(mutex_own(&(buf_pool->mutex)));
#endif /* UNIV_SYNC_DEBUG */ #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) if ((ut_dulint_cmp(block->oldest_modification, ut_dulint_zero) > 0)
|| (block->buf_fix_count != 0) || (block->buf_fix_count != 0)

1
innobase/dict/dict0load.c
View file

@ -769,7 +769,6 @@ dict_load_table(
/* Check if the table name in record is the searched one */ /* Check if the table name in record is the searched one */
if (len != ut_strlen(name) || ut_memcmp(name, field, len) != 0) { if (len != ut_strlen(name) || ut_memcmp(name, field, len) != 0) {
btr_pcur_close(&pcur); btr_pcur_close(&pcur);
mtr_commit(&mtr); mtr_commit(&mtr);
mem_heap_free(heap); mem_heap_free(heap);

2
man/mysql.1.in
View file

@ -107,7 +107,7 @@ version number and exit.
Wait and retry if the database server connection is down. Wait and retry if the database server connection is down.
.SH FILES .SH FILES
.TP 2.2i .TP 2.2i
.I @sysconfdir@/my.cnf .I /etc/my.cnf
MySQL configuration file MySQL configuration file
.TP .TP
.I @bindir@/mysql .I @bindir@/mysql