diff options
| author | unknown <svoj@poseidon.ndb.mysql.com> | 2005-11-06 16:16:18 +0100 |
|---|---|---|
| committer | unknown <svoj@poseidon.ndb.mysql.com> | 2005-11-06 16:16:18 +0100 |
| commit | df33aacd87ff08c27fd371a0bb348fe3986e6f95 (patch) | |
| tree | 0c9f1805d1951780ff34fb797c8fec0193020aab /include | |
| parent | 2bddb0766473270f43e70bed16f3223255fee4a9 (diff) | |
| parent | 3e5508909f7b7bebabfca5711e5778927279be19 (diff) | |
| download | mariadb-git-df33aacd87ff08c27fd371a0bb348fe3986e6f95.tar.gz | |
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
Diffstat (limited to 'include')
| -rw-r--r-- | include/ft_global.h | 1 | ||||
| -rw-r--r-- | include/my_global.h | 9 | ||||
| -rw-r--r-- | include/myisam.h | 2 |
3 files changed, 12 insertions, 0 deletions
diff --git a/include/ft_global.h b/include/ft_global.h index c3f60d13a7a..8f02e48f61d 100644 --- a/include/ft_global.h +++ b/include/ft_global.h @@ -53,6 +53,7 @@ extern ulong ft_min_word_len; extern ulong ft_max_word_len; extern ulong ft_query_expansion_limit; extern char ft_boolean_syntax[15]; +extern struct st_mysql_ftparser ft_default_parser; int ft_init_stopwords(void); void ft_free_stopwords(void); diff --git a/include/my_global.h b/include/my_global.h index 55a1b6c2d02..be7b668fdc0 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -1380,4 +1380,13 @@ do { doubleget_union _tmp; \ #define dlerror() "" #endif +/* FreeBSD 2.2.2 does not define RTLD_NOW) */ +#ifndef RTLD_NOW +#define RTLD_NOW 1 +#endif + +#ifndef HAVE_DLERROR +#define dlerror() "" +#endif + #endif /* my_global_h */ diff --git a/include/myisam.h b/include/myisam.h index 56717524bb2..6c130af740e 100644 --- a/include/myisam.h +++ b/include/myisam.h @@ -32,6 +32,7 @@ extern "C" { #include "keycache.h" #endif #include "my_handler.h" +#include <plugin.h> /* defines used by myisam-funktions */ @@ -196,6 +197,7 @@ typedef struct st_mi_keydef /* Key definition with open & info */ uint32 version; /* For concurrent read/write */ HA_KEYSEG *seg,*end; + struct st_mysql_ftparser *parser; /* Fulltext [pre]parser */ int (*bin_search)(struct st_myisam_info *info,struct st_mi_keydef *keyinfo, uchar *page,uchar *key, uint key_len,uint comp_flag,uchar * *ret_pos, |