summaryrefslogtreecommitdiff
path: root/storage/myisam/ft_myisam.c
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 /storage/myisam/ft_myisam.c
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 'storage/myisam/ft_myisam.c')
-rw-r--r--storage/myisam/ft_myisam.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/myisam/ft_myisam.c b/storage/myisam/ft_myisam.c
index bef3fbfd5f5..7bcc62d5bf5 100644
--- a/storage/myisam/ft_myisam.c
+++ b/storage/myisam/ft_myisam.c
@@ -23,8 +23,8 @@
#include "ftdefs.h"
FT_INFO *ft_init_search(uint flags, void *info, uint keynr,
- uchar *query, uint query_len, CHARSET_INFO *cs,
- uchar *record)
+ uchar *query, size_t query_len,
+ CHARSET_INFO *cs, uchar *record)
{
FT_INFO *res;
if (flags & FT_BOOL)