branches/innodb+: Revert some debugging-related changes

that were accidentally committed in r2971:

univ.i, ha_innobase::create(): Reduce the uncompressed page size from
16 to 4 kilobytes.

btr_cur_search_to_nth_level(): Print a diagnostic message when the
leaf page of a secondary index is being requested from the disk.

buf_read_ahead_random(), buf_read_ahead_linear(): Disable.

btr/btr0cur.c

@@ -528,14 +528,6 @@ btr_cur_search_to_nth_level(
 		buf_mode = BUF_GET_IF_IN_POOL_OR_WATCH;
 	}
 
-	if (height == 0
-	    && buf_mode != BUF_GET_IF_IN_POOL
-	    && buf_mode != BUF_GET_IF_IN_POOL_OR_WATCH
-	    && !dict_index_is_clust(index)) {
-		fprintf(stderr, "fetching %lu:%lu of %s\n",
-			(ulong) space, (ulong) page_no, index->name);
-	}
-
 	block = buf_page_get_gen(
 		space, zip_size, page_no, rw_latch, guess, buf_mode,
 		__FILE__, __LINE__, mtr);

buf/buf0rea.c

@@ -177,9 +177,6 @@ buf_read_ahead_random(
 	ulint	offset)	/* in: page number of a page which the current thread
 			wants to access */
 {
-#if 1
-	return(0);
-#else
 	ib_int64_t	tablespace_version;
 	ulint		recent_blocks	= 0;
 	ulint		count;
@@ -312,7 +309,6 @@ buf_read_ahead_random(
 
 	++srv_read_ahead_rnd;
 	return(count);
-#endif
 }
 
 /************************************************************************
@@ -399,9 +395,6 @@ buf_read_ahead_linear(
 	ulint	offset)	/* in: page number of a page; NOTE: the current thread
 			must want access to this page (see NOTE 3 above) */
 {
-#if 1
-	return(0);
-#else
 	ib_int64_t	tablespace_version;
 	buf_page_t*	bpage;
 	buf_frame_t*	frame;
@@ -634,7 +627,6 @@ buf_read_ahead_linear(
 
 	++srv_read_ahead_seq;
 	return(count);
-#endif
 }
 
 /************************************************************************

handler/ha_innodb.cc

@@ -5894,7 +5894,6 @@ ha_innobase::create(
 				| DICT_TF_FORMAT_ZIP
 				  << DICT_TF_FORMAT_SHIFT;
 			break;
-#if 0
 		case 8:
 			flags = 4 << DICT_TF_ZSSIZE_SHIFT
 				| DICT_TF_COMPACT
@@ -5907,9 +5906,8 @@ ha_innobase::create(
 				| DICT_TF_FORMAT_ZIP
 				  << DICT_TF_FORMAT_SHIFT;
 			break;
-#endif
-#if DICT_TF_ZSSIZE_MAX != 3
-# error "DICT_TF_ZSSIZE_MAX != 3"
+#if DICT_TF_ZSSIZE_MAX != 5
+# error "DICT_TF_ZSSIZE_MAX != 5"
 #endif
 		}
 

include/univ.i

@@ -235,7 +235,7 @@ management to ensure correct alignment for doubles etc. */
 */
 
 /* The 2-logarithm of UNIV_PAGE_SIZE: */
-#define UNIV_PAGE_SIZE_SHIFT	12
+#define UNIV_PAGE_SIZE_SHIFT	14
 /* The universal page size of the database */
 #define UNIV_PAGE_SIZE		(1 << UNIV_PAGE_SIZE_SHIFT)