summaryrefslogtreecommitdiff
path: root/storage/maria/ma_fulltext.h
diff options
context:
space:
mode:
authorunknown <jani@hynda.mysql.fi>2007-07-02 20:45:15 +0300
committerunknown <jani@hynda.mysql.fi>2007-07-02 20:45:15 +0300
commit631ecaabea7336a8f28367c0d1c291f0433f7e88 (patch)
tree2eb68f1f6af5e60c4bcdd8fcfa7e14f3650de830 /storage/maria/ma_fulltext.h
parentcfdd73369c0c2d57908af8dc727de33567fe9e0b (diff)
downloadmariadb-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/ma_fulltext.h')
-rw-r--r--storage/maria/ma_fulltext.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/storage/maria/ma_fulltext.h b/storage/maria/ma_fulltext.h
index 778ffd49196..dc6cf9d1204 100644
--- a/storage/maria/ma_fulltext.h
+++ b/storage/maria/ma_fulltext.h
@@ -20,8 +20,8 @@
#include "maria_def.h"
#include "ft_global.h"
-int _ma_ft_cmp(MARIA_HA *, uint, const byte *, const byte *);
-int _ma_ft_add(MARIA_HA *, uint, byte *, const byte *, my_off_t);
-int _ma_ft_del(MARIA_HA *, uint, byte *, const byte *, my_off_t);
+int _ma_ft_cmp(MARIA_HA *, uint, const uchar *, const uchar *);
+int _ma_ft_add(MARIA_HA *, uint, uchar *, const uchar *, my_off_t);
+int _ma_ft_del(MARIA_HA *, uint, uchar *, const uchar *, my_off_t);
-uint _ma_ft_convert_to_ft2(MARIA_HA *, uint, byte *);
+uint _ma_ft_convert_to_ft2(MARIA_HA *, uint, uchar *);