Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
b5469837
Commit
b5469837
authored
Mar 17, 2004
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/my/mysql-4.0
parents
e11a162b
5164e291
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
24 additions
and
16 deletions
+24
-16
innobase/btr/btr0cur.c
innobase/btr/btr0cur.c
+11
-1
innobase/btr/btr0sea.c
innobase/btr/btr0sea.c
+2
-0
innobase/include/btr0cur.h
innobase/include/btr0cur.h
+0
-10
innobase/include/btr0sea.h
innobase/include/btr0sea.h
+2
-0
innobase/include/page0cur.h
innobase/include/page0cur.h
+4
-1
innobase/page/page0cur.c
innobase/page/page0cur.c
+4
-3
myisam/myisam_ftdump.c
myisam/myisam_ftdump.c
+1
-1
No files found.
innobase/btr/btr0cur.c
View file @
b5469837
...
...
@@ -65,6 +65,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. */
...
...
@@ -2922,7 +2932,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
(
/*=========================*/
...
...
innobase/btr/btr0sea.c
View file @
b5469837
...
...
@@ -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
...
...
innobase/include/btr0cur.h
View file @
b5469837
...
...
@@ -435,16 +435,6 @@ btr_cur_mark_dtuple_inherited_extern(
ulint
n_ext_vec
,
/* in: number of elements in ext_vec */
upd_t
*
update
);
/* in: update vector */
/***********************************************************************
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. */
void
btr_cur_unmark_extern_fields
(
/*=========================*/
rec_t
*
rec
,
/* in: record in a clustered index */
mtr_t
*
mtr
);
/* in: mtr */
/***********************************************************************
Marks all extern fields in a dtuple as owned by the record. */
void
...
...
innobase/include/btr0sea.h
View file @
b5469837
...
...
@@ -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
...
...
innobase/include/page0cur.h
View file @
b5469837
...
...
@@ -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. */
...
...
innobase/page/page0cur.c
View file @
b5469837
...
...
@@ -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. */
...
...
myisam/myisam_ftdump.c
View file @
b5469837
...
...
@@ -261,7 +261,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
static
void
usage
()
{
printf
(
"Use:
ft_dump <table_name> <index_no
>
\n
"
);
printf
(
"Use:
myisam_ftdump <table_name> <index_num
>
\n
"
);
my_print_help
(
my_long_options
);
my_print_variables
(
my_long_options
);
exit
(
1
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment