branches/innodb+: Merge revisions 3152:3177 from branches/zip:

  ------------------------------------------------------------------------
  r3170 | marko | 2008-11-21 10:11:18 +0200 (Fri, 21 Nov 2008) | 4 lines

  branches/zip: dtuple_print(): Dump each field in a separate line,
  so that the dumps can be read and compared more easily.
  This is related to the change to rec_print_old() and rec_print_comp()
  in r3148.
  ------------------------------------------------------------------------
  r3177 | marko | 2008-11-21 16:24:31 +0200 (Fri, 21 Nov 2008) | 3 lines

  branches/zip: buf_LRU_free_block(), buf_page_try_get_func(): Assert that
  there is nothing in the insert buffer for the page.  This is for
  tracking down Issue #128.
  ------------------------------------------------------------------------

buf/buf0buf.c

@@ -2489,6 +2489,11 @@ buf_page_try_get_func(
 
 	buf_pool->n_page_gets++;
 
+#ifdef UNIV_IBUF_COUNT_DEBUG
+	ut_a(ibuf_count_get(buf_block_get_space(block),
+			    buf_block_get_page_no(block)) == 0);
+#endif
+
 	return(block);
 }
 

buf/buf0lru.c

@@ -26,6 +26,7 @@ Created 11/5/1995 Heikki Tuuri
 #include "buf0flu.h"
 #include "buf0rea.h"
 #include "btr0sea.h"
+#include "ibuf0ibuf.h"
 #include "os0file.h"
 #include "page0zip.h"
 #include "log0recv.h"
@@ -1321,6 +1322,10 @@ buf_LRU_free_block(
 	ut_ad(!bpage->in_flush_list == !bpage->oldest_modification);
 	UNIV_MEM_ASSERT_RW(bpage, sizeof *bpage);
 
+#ifdef UNIV_IBUF_COUNT_DEBUG
+	ut_a(ibuf_count_get(bpage->space, bpage->offset) == 0);
+#endif /* UNIV_IBUF_COUNT_DEBUG */
+
 	if (!buf_page_can_relocate(bpage)) {
 
 		/* Do not free buffer-fixed or I/O-fixed blocks. */

data/data0data.c

@@ -534,9 +534,9 @@ dtuple_print(
 		dfield_print_raw(f, dtuple_get_nth_field(tuple, i));
 
 		putc(';', f);
+		putc('\n', f);
 	}
 
-	putc('\n', f);
 	ut_ad(dtuple_validate(tuple));
 }