1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge bk-internal.mysql.com:/home/bk/mysql-4.0

Browse Source 
into mysql.com:/home/my/mysql-4.0
This commit is contained in:
monty@mysql.com 2004-03-17 10:25:53 +02:00
commit e8c65b886d
7 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
innobase/btr/btr0cur.c
View File

@ -65,6 +65,16 @@ this many index pages */
/*--------------------------------------*/ /*--------------------------------------*/
#define BTR_BLOB_HDR_SIZE 8 #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 Adds path information to the cursor for the current page, for which
the binary search has been performed. */ 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 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 should be called if the delete mark of a record is removed: a not delete
marked record always owns all its extern fields. */ marked record always owns all its extern fields. */
static
void void
btr_cur_unmark_extern_fields( btr_cur_unmark_extern_fields(
/*=========================*/ /*=========================*/

2
innobase/btr/btr0sea.c
View File

@ -22,7 +22,9 @@ Created 2/17/1996 Heikki Tuuri
ulint btr_search_this_is_zero = 0; /* A dummy variable to fool the ulint btr_search_this_is_zero = 0; /* A dummy variable to fool the
compiler */ compiler */
#ifdef UNIV_SEARCH_PERF_STAT
ulint btr_search_n_succ = 0; ulint btr_search_n_succ = 0;
#endif /* UNIV_SEARCH_PERF_STAT */
ulint btr_search_n_hash_fail = 0; ulint btr_search_n_hash_fail = 0;
byte btr_sea_pad1[64]; /* padding to prevent other memory update byte btr_sea_pad1[64]; /* padding to prevent other memory update

10
innobase/include/btr0cur.h
View File

@ -435,16 +435,6 @@ btr_cur_mark_dtuple_inherited_extern(
ulint n_ext_vec, /* in: number of elements in ext_vec */ ulint n_ext_vec, /* in: number of elements in ext_vec */
upd_t* update); /* in: update vector */ 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. */ Marks all extern fields in a dtuple as owned by the record. */
void void

2
innobase/include/btr0sea.h
View File

@ -214,7 +214,9 @@ extern rw_lock_t* btr_search_latch_temp;
#define btr_search_latch (*btr_search_latch_temp) #define btr_search_latch (*btr_search_latch_temp)
#ifdef UNIV_SEARCH_PERF_STAT
extern ulint btr_search_n_succ; extern ulint btr_search_n_succ;
#endif /* UNIV_SEARCH_PERF_STAT */
extern ulint btr_search_n_hash_fail; extern ulint btr_search_n_hash_fail;
/* After change in n_fields or n_bytes in info, this many rounds are waited /* After change in n_fields or n_bytes in info, this many rounds are waited

5
innobase/include/page0cur.h
View File

@ -32,8 +32,11 @@ Created 10/4/1994 Heikki Tuuri
which extend it */ which extend it */
#define PAGE_CUR_DBG 6 #define PAGE_CUR_DBG 6
#ifdef PAGE_CUR_ADAPT
# ifdef UNIV_SEARCH_PERF_STAT
extern ulint page_cur_short_succ; 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. */ Gets pointer to the page frame where the cursor is positioned. */

7
innobase/page/page0cur.c
View File

@ -16,11 +16,12 @@ Created 10/4/1994 Heikki Tuuri
#include "log0recv.h" #include "log0recv.h"
#include "rem0cmp.h" #include "rem0cmp.h"
ulint page_cur_short_succ = 0; static ulint page_rnd = 976722341;
ulint page_rnd = 976722341;
#ifdef PAGE_CUR_ADAPT #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. */ Tries a search shortcut based on the last insert. */

2
myisam/myisam_ftdump.c
View File

@ -261,7 +261,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
static void usage() 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_help(my_long_options);
my_print_variables(my_long_options); my_print_variables(my_long_options);
exit(1); exit(1);