diff options
| author | unknown <serg@serg.mysql.com> | 2001-11-28 18:01:50 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mysql.com> | 2001-11-28 18:01:50 +0100 |
| commit | d987ee7651cf1ed21d7082399ef02fa551c3e9f5 (patch) | |
| tree | 0ab79a595aa567c880823477d9a52a1b59b1d1ca /include | |
| parent | a7f23db34072e523cc3aec2a14ce5de47d529c6f (diff) | |
| parent | f3918c8413199fff3339a62498ecc42d8c540c3a (diff) | |
| download | mariadb-git-d987ee7651cf1ed21d7082399ef02fa551c3e9f5.tar.gz | |
Merge
sql/sql_select.cc:
Auto merged
Docs/manual.texi:
SCCS merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/ft_global.h | 2 | ||||
| -rw-r--r-- | include/my_base.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/ft_global.h b/include/ft_global.h index 52fb8d38a9a..064dd7a6538 100644 --- a/include/ft_global.h +++ b/include/ft_global.h @@ -32,7 +32,7 @@ extern "C" { typedef struct st_ft_info FT_INFO; struct _ft_vft { int (*read_next)(FT_INFO *, char *); - float (*find_relevance)(FT_INFO *, my_off_t, byte *); + float (*find_relevance)(FT_INFO *, byte *, uint); void (*close_search)(FT_INFO *); float (*get_relevance)(FT_INFO *); void (*reinit_search)(FT_INFO *); diff --git a/include/my_base.h b/include/my_base.h index adb2366f454..abd2ac602e5 100644 --- a/include/my_base.h +++ b/include/my_base.h @@ -226,6 +226,7 @@ enum ha_base_keytype { /* Other constants */ #define HA_NAMELEN 64 /* Max length of saved filename */ +#define NO_SUCH_KEY ((uint)~0) /* used as a key no. */ /* Intern constants in databases */ |