diff options
author | unknown <monty@mysql.com> | 2004-03-17 10:36:12 +0200 |
---|---|---|
committer | unknown <monty@mysql.com> | 2004-03-17 10:36:12 +0200 |
commit | 219bbd5232d6ff958f97b30abbc0cb9646abf6a8 (patch) | |
tree | 6f4235e7fd4eb101374c74e2c3c02470bb69d2ab /innobase/page | |
parent | b523802138eef0c66d6ce89263b512c1494a277b (diff) | |
parent | b54698374b5eea922a6f054338d804c2ba3aa682 (diff) | |
download | mariadb-git-219bbd5232d6ff958f97b30abbc0cb9646abf6a8.tar.gz |
merge with 4.0
innobase/btr/btr0cur.c:
Auto merged
innobase/btr/btr0sea.c:
Auto merged
innobase/include/log0log.h:
Auto merged
innobase/include/log0log.ic:
Auto merged
innobase/log/log0recv.c:
Auto merged
innobase/page/page0cur.c:
Auto merged
innobase/que/que0que.c:
Auto merged
myisam/myisam_ftdump.c:
Auto merged
mysql-test/r/func_if.result:
Auto merged
mysql-test/t/func_if.test:
Auto merged
Diffstat (limited to 'innobase/page')
-rw-r--r-- | innobase/page/page0cur.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/innobase/page/page0cur.c b/innobase/page/page0cur.c index eb2ba5b8bf8..5d26d12bf20 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. */ |