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

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)

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);

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