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

branches/innodb+: Revert some debugging-related changes

Browse source 
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.
This commit is contained in:
marko 2008-11-07 12:16:36 +00:00
parent 7c37bc941f
commit 58d342c90a
4 changed files with 3 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
btr/btr0cur.c
View file

@ -528,14 +528,6 @@ retry_page_get:
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);

8
buf/buf0rea.c
View file

@ -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 @@ read_ahead:
++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
}
/************************************************************************

6
handler/ha_innodb.cc
View file

@ -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
}

2
include/univ.i
View file

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