diff options
author | unknown <jani@hynda.mysql.fi> | 2007-07-02 20:45:15 +0300 |
---|---|---|
committer | unknown <jani@hynda.mysql.fi> | 2007-07-02 20:45:15 +0300 |
commit | 631ecaabea7336a8f28367c0d1c291f0433f7e88 (patch) | |
tree | 2eb68f1f6af5e60c4bcdd8fcfa7e14f3650de830 /storage/maria/ft_maria.c | |
parent | cfdd73369c0c2d57908af8dc727de33567fe9e0b (diff) | |
download | mariadb-git-631ecaabea7336a8f28367c0d1c291f0433f7e88.tar.gz |
Merged with mysql-5.1 main tree.
BUILD/compile-pentium-debug-max:
Added definition after macro was removed from main tree. This will
be fixed back in main tree later.
Diffstat (limited to 'storage/maria/ft_maria.c')
-rw-r--r-- | storage/maria/ft_maria.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/maria/ft_maria.c b/storage/maria/ft_maria.c index 06e7c4bd59c..1b082f904d0 100644 --- a/storage/maria/ft_maria.c +++ b/storage/maria/ft_maria.c @@ -22,8 +22,8 @@ #include "ma_ftdefs.h" FT_INFO *maria_ft_init_search(uint flags, void *info, uint keynr, - byte *query, uint query_len, CHARSET_INFO *cs, - byte *record) + uchar *query, uint query_len, CHARSET_INFO *cs, + uchar *record) { FT_INFO *res; if (flags & FT_BOOL) |