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/btr | |
| 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/btr')
| -rw-r--r-- | innobase/btr/btr0cur.c | 12 | ||||
| -rw-r--r-- | innobase/btr/btr0sea.c | 2 |
2 files changed, 13 insertions, 1 deletions
diff --git a/innobase/btr/btr0cur.c b/innobase/btr/btr0cur.c index af3a61041cb..f6a4a6f38f0 100644 --- a/innobase/btr/btr0cur.c +++ b/innobase/btr/btr0cur.c @@ -66,6 +66,16 @@ this many index pages */ #define BTR_BLOB_HDR_SIZE 8 /*********************************************************************** +Marks all extern fields in a record as owned by the record. This function +should be called if the delete mark of a record is removed: a not delete +marked record always owns all its extern fields. */ +static +void +btr_cur_unmark_extern_fields( +/*=========================*/ + rec_t* rec, /* in: record in a clustered index */ + mtr_t* mtr); /* in: mtr */ +/*********************************************************************** Adds path information to the cursor for the current page, for which the binary search has been performed. */ static @@ -2933,7 +2943,7 @@ btr_cur_mark_dtuple_inherited_extern( Marks all extern fields in a record as owned by the record. This function should be called if the delete mark of a record is removed: a not delete marked record always owns all its extern fields. */ - +static void btr_cur_unmark_extern_fields( /*=========================*/ diff --git a/innobase/btr/btr0sea.c b/innobase/btr/btr0sea.c index 238f118e260..2093d5ea757 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 |