diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-01-27 23:53:08 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-01-27 23:53:08 +0200 |
| commit | e2efd9338574c87177e0c00273e6e49a32ce2aa6 (patch) | |
| tree | fce58762d53982fec4e09ab4321e86409a46cf41 /include/maria.h | |
| parent | 93089873623bb82cf5ca4c4cf1cf146796dd31dd (diff) | |
| download | mariadb-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/maria.h')
| -rw-r--r-- | include/maria.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/maria.h b/include/maria.h index 3c2fc08d9a8..c961b7d1672 100644 --- a/include/maria.h +++ b/include/maria.h @@ -462,7 +462,7 @@ void maria_versioning(MARIA_HA *info, my_bool versioning); void maria_ignore_trids(MARIA_HA *info); /* fulltext functions */ -FT_INFO *maria_ft_init_search(uint,void *, uint, uchar *, uint, +FT_INFO *maria_ft_init_search(uint,void *, uint, uchar *, size_t, CHARSET_INFO *, uchar *); /* 'Almost-internal' Maria functions */ |