summaryrefslogtreecommitdiff
path: root/include/ft_global.h
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2010-01-27 23:53:08 +0200
committerMichael Widenius <monty@askmonty.org>2010-01-27 23:53:08 +0200
commite2efd9338574c87177e0c00273e6e49a32ce2aa6 (patch)
treefce58762d53982fec4e09ab4321e86409a46cf41 /include/ft_global.h
parent93089873623bb82cf5ca4c4cf1cf146796dd31dd (diff)
downloadmariadb-git-e2efd9338574c87177e0c00273e6e49a32ce2aa6.tar.gz
Fixed some compiler warnings and errors in test suite found by buildbot
include/ft_global.h: Changed string size to 'size_t' (to avoid compiler warnings later) include/maria.h: Changed string size to 'size_t' (to avoid compiler warnings later) mysql-test/r/show_check.result: Don't use logging to tables, as there is no guarantee in which order tables are showed in 'show open tables' mysql-test/suite/rpl/t/rpl_rotate_logs.test: Use HIGH_PRIORITY inserts to avoid problem with concurrent inserts on the slave. mysql-test/t/show_check-master.opt: Don't use logging to tables, as there is no guarantee in which order tables are showed in 'show open tables' sql/item.cc: Fixed compiler warning storage/maria/ft_maria.c: Changed string size to 'size_t' (to avoid compiler warnings later) storage/myisam/ft_boolean_search.c: Fixed compiler warnings storage/myisam/ft_myisam.c: Changed string size to 'size_t' (to avoid compiler warnings later) storage/myisam/ft_nlq_search.c: Changed string size to 'size_t' (to avoid compiler warnings later) storage/myisam/ft_parser.c: Changed string size to 'size_t' (to avoid compiler warnings) storage/myisam/ft_stopwords.c: Changed string size to 'size_t' (to avoid compiler warnings) storage/myisam/ftdefs.h: Changed string size to 'size_t' (to avoid compiler warnings)
Diffstat (limited to 'include/ft_global.h')
-rw-r--r--include/ft_global.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/ft_global.h b/include/ft_global.h
index 8fe5ee5c42e..4a4cf84b119 100644
--- a/include/ft_global.h
+++ b/include/ft_global.h
@@ -62,7 +62,8 @@ void ft_free_stopwords(void);
#define FT_SORTED 2
#define FT_EXPAND 4 /* query expansion */
-FT_INFO *ft_init_search(uint,void *, uint, uchar *, uint,CHARSET_INFO *, uchar *);
+FT_INFO *ft_init_search(uint,void *, uint, uchar *, size_t,
+ CHARSET_INFO *, uchar *);
my_bool ft_boolean_check_syntax_string(const uchar *);
/* Internal symbols for fulltext between maria and MyISAM */