diff options
author | unknown <serg@janus.mylan> | 2007-10-08 21:01:44 +0200 |
---|---|---|
committer | unknown <serg@janus.mylan> | 2007-10-08 21:01:44 +0200 |
commit | ceadd59644981c103831d9c20b1f06bbab337989 (patch) | |
tree | d53c392b402d00eeeb5b401ac93da40017f87801 /include/ft_global.h | |
parent | 7bb3501ff901d62fe249373e848a81c3c0e973b8 (diff) | |
parent | 6c7a278c836c086d59a84589988536d654fd0a57 (diff) | |
download | mariadb-git-ceadd59644981c103831d9c20b1f06bbab337989.tar.gz |
Merge janus.mylan:/usr/home/serg/Abk/mysql-5.1
into janus.mylan:/usr/home/serg/Abk/mysql-maria1
Makefile.am:
Auto merged
client/mysqldump.c:
Auto merged
configure.in:
Auto merged
libmysqld/Makefile.am:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/mysqldump.result:
Auto merged
mysql-test/t/disabled.def:
Auto merged
mysql-test/t/mysqldump.test:
Auto merged
mysys/mf_tempfile.c:
Auto merged
sql/Makefile.am:
Auto merged
sql/ha_partition.cc:
Auto merged
sql/ha_partition.h:
Auto merged
sql/handler.cc:
Auto merged
sql/lock.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_plugin.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/table.cc:
Auto merged
sql/table.h:
Auto merged
BUILD/compile-dist:
SCCS merged
Diffstat (limited to 'include/ft_global.h')
-rw-r--r-- | include/ft_global.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/include/ft_global.h b/include/ft_global.h index 752371d6bc6..dba8a6e75e5 100644 --- a/include/ft_global.h +++ b/include/ft_global.h @@ -65,6 +65,17 @@ void ft_free_stopwords(void); FT_INFO *ft_init_search(uint,void *, uint, uchar *, uint,CHARSET_INFO *, uchar *); my_bool ft_boolean_check_syntax_string(const uchar *); +/* Internal symbols for fulltext between maria and MyISAM */ + +#define HA_FT_WTYPE HA_KEYTYPE_FLOAT +#define HA_FT_WLEN 4 +#define FT_SEGS 2 + +#define ft_sintXkorr(A) mi_sint4korr(A) +#define ft_intXstore(T,A) mi_int4store(T,A) + +extern const HA_KEYSEG ft_keysegs[FT_SEGS]; + #ifdef __cplusplus } #endif |