diff options
| author | unknown <marko@hundin.mysql.fi> | 2004-03-16 18:55:44 +0200 |
|---|---|---|
| committer | unknown <marko@hundin.mysql.fi> | 2004-03-16 18:55:44 +0200 |
| commit | 7812cd87378a3d7c63bf45dfbc796ee4b61898ab (patch) | |
| tree | 277f954070cd694be818e3ca8ca3f9f4da7ee578 | |
| parent | 8d2bb926fbe5431faf2ae768ecad6240954295fd (diff) | |
| download | mariadb-git-7812cd87378a3d7c63bf45dfbc796ee4b61898ab.tar.gz | |
InnoDB: Remove some debug variables unless UNIV_SEARCH_PERF_STAT is defined
innobase/btr/btr0sea.c:
Remove variable btr_search_n_succ unless #ifdef UNIV_SEARCH_PERF_STAT
innobase/include/btr0sea.h:
Remove variable btr_search_n_succ unless #ifdef UNIV_SEARCH_PERF_STAT
innobase/page/page0cur.c:
Make page_rnd a static variable
Remove variable page_cur_short_succ unless #ifdef UNIV_SEARCH_PERF_STAT
innobase/include/page0cur.h:
Remove variable page_cur_short_succ unless #ifdef UNIV_SEARCH_PERF_STAT
| -rw-r--r-- | innobase/btr/btr0sea.c | 2 | ||||
| -rw-r--r-- | innobase/include/btr0sea.h | 2 | ||||
| -rw-r--r-- | innobase/include/page0cur.h | 5 | ||||
| -rw-r--r-- | innobase/page/page0cur.c | 7 |
4 files changed, 12 insertions, 4 deletions
diff --git a/innobase/btr/btr0sea.c b/innobase/btr/btr0sea.c index 9421ca48718..f629dea74de 100644 --- a/innobase/btr/btr0sea.c +++ b/innobase/btr/btr0sea.c @@ -22,7 +22,9 @@ Created 2/17/1996 Heikki Tuuri ulint btr_search_this_is_zero = 0; /* A dummy variable to fool the compiler */ +#ifdef UNIV_SEARCH_PERF_STAT ulint btr_search_n_succ = 0; +#endif /* UNIV_SEARCH_PERF_STAT */ ulint btr_search_n_hash_fail = 0; byte btr_sea_pad1[64]; /* padding to prevent other memory update diff --git a/innobase/include/btr0sea.h b/innobase/include/btr0sea.h index 68396d47193..ce4140ecf92 100644 --- a/innobase/include/btr0sea.h +++ b/innobase/include/btr0sea.h @@ -214,7 +214,9 @@ extern rw_lock_t* btr_search_latch_temp; #define btr_search_latch (*btr_search_latch_temp) +#ifdef UNIV_SEARCH_PERF_STAT extern ulint btr_search_n_succ; +#endif /* UNIV_SEARCH_PERF_STAT */ extern ulint btr_search_n_hash_fail; /* After change in n_fields or n_bytes in info, this many rounds are waited diff --git a/innobase/include/page0cur.h b/innobase/include/page0cur.h index c3f0decdb4b..c85669ed4df 100644 --- a/innobase/include/page0cur.h +++ b/innobase/include/page0cur.h @@ -32,8 +32,11 @@ Created 10/4/1994 Heikki Tuuri which extend it */ #define PAGE_CUR_DBG 6 - +#ifdef PAGE_CUR_ADAPT +# ifdef UNIV_SEARCH_PERF_STAT extern ulint page_cur_short_succ; +# endif /* UNIV_SEARCH_PERF_STAT */ +#endif /* PAGE_CUR_ADAPT */ /************************************************************* Gets pointer to the page frame where the cursor is positioned. */ diff --git a/innobase/page/page0cur.c b/innobase/page/page0cur.c index b08efacf43a..890452cfceb 100644 --- a/innobase/page/page0cur.c +++ b/innobase/page/page0cur.c @@ -16,11 +16,12 @@ Created 10/4/1994 Heikki Tuuri #include "log0recv.h" #include "rem0cmp.h" -ulint page_cur_short_succ = 0; - -ulint page_rnd = 976722341; +static ulint page_rnd = 976722341; #ifdef PAGE_CUR_ADAPT +# ifdef UNIV_SEARCH_PERF_STAT +ulint page_cur_short_succ = 0; +# endif /* UNIV_SEARCH_PERF_STAT */ /******************************************************************** Tries a search shortcut based on the last insert. */ |