diff options
author | Michael Widenius <monty@askmonty.org> | 2009-11-30 15:36:06 +0200 |
---|---|---|
committer | Michael Widenius <monty@askmonty.org> | 2009-11-30 15:36:06 +0200 |
commit | 0df8279c468235f4feaf9eb25aa2beb5032ee1dc (patch) | |
tree | d5878052823f9a1345068a3b20275d13e0a41e9e /include/ft_global.h | |
parent | 5d9c3014ce6afdb3129d8d836b557507f7f7a643 (diff) | |
download | mariadb-git-0df8279c468235f4feaf9eb25aa2beb5032ee1dc.tar.gz |
Fixes after comments from last push:
- Removed some not needed casts
- Change plugin.h to be 'binary compatible' with old versions
- Added mysql_ft_size_t typedef to plugin.h to make it trivial to change string lengths to size_t on next ABI change
- Made some fixes suggested by Kristian to make things more portable and future safe (when it comes to strict aliasing)
include/ft_global.h:
Introduced FT_WEIGTH, to handle fulltext weights in a slightly more portable manner
include/mysql/plugin.h:
Change plugin.h to be 'binary compatible' with old versions
Added mysql_ft_size_t typedef to plugin.h to make it trivial to change string lengths to size_t on next ABI change
Changed flags to unsigned (as flags should always be unsigned)
mysql-test/t/information_schema.test:
Fixed typo
sql/sp_head.cc:
Removed cast
sql/sql_select.cc:
Removed cast
sql/table.cc:
Removed cast
storage/maria/ma_ft_boolean_search.c:
Use mysql_ft_size_t instead of size_t for plugin.h code
Changed some other string lengths to size_t
storage/maria/ma_ft_nlq_search.c:
Use FT_WEIGTH to make code more portable
storage/maria/ma_ft_parser.c:
Use mysql_ft_size_t instead of size_t for plugin.h code
Changed some other string lengths to size_t
storage/maria/ma_ftdefs.h:
Changed some string lengths to size_t
storage/maria/maria_ftdump.c:
Use FT_WEIGTH to make code more portable
storage/myisam/ft_boolean_search.c:
Use mysql_ft_size_t instead of size_t for plugin.h code
storage/myisam/ft_nlq_search.c:
Use FT_WEIGTH to make code more portable
storage/myisam/ft_parser.c:
Use mysql_ft_size_t instead of size_t for plugin.h code
storage/myisam/myisam_ftdump.c:
Use FT_WEIGTH to make code more portable
Diffstat (limited to 'include/ft_global.h')
-rw-r--r-- | include/ft_global.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/ft_global.h b/include/ft_global.h index dba8a6e75e5..8fe5ee5c42e 100644 --- a/include/ft_global.h +++ b/include/ft_global.h @@ -76,6 +76,8 @@ my_bool ft_boolean_check_syntax_string(const uchar *); extern const HA_KEYSEG ft_keysegs[FT_SEGS]; +typedef union {int32 i; float f;} FT_WEIGTH; + #ifdef __cplusplus } #endif |