mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
Several fixes revelaled by Intel compiler.
cmd-line-utils/readline/complete.c: Added a cast. dbug/my_main.c: Added an include to avoid implicit declaration of my_thread_global_init() include/my_global.h: undef cannot be used on this predefined name. Since it is a custom fix for gcc 2.8.0, let's make it only effective in that case. include/my_sys.h: Added a new type, TYPE_NOT_SET. myisam/ft_boolean_search.c: Added casts. myisam/mi_key.c: Added cast. myisam/mi_open.c: Added cast. Changed function types. myisam/mi_test1.c: Added cast. myisam/myisamchk.c: Added cast. myisam/myisamdef.h: Changed function type. myisam/myisampack.c: Added casts. myisam/sp_key.c: Added cast. mysys/mf_iocache.c: Fixed invalid use of 0 to info->type. According to comment it should not have been set, but in earlier code by setting it to 0 would have been same as setting it to READ_CACHE. This probably was not desired, potential bug. server-tools/instance-manager/instance_options.cc: Fixed a typo. server-tools/instance-manager/protocol.cc: Changed enum to int. Changed char to uchar. Added casts. sql/mysql_priv.h: Bit overflow. sql/sql_base.cc: Removed unused label. The code below label was unused too, because there is a return just before. sql/sql_parse.cc: Removed unneccessary extra argument.
This commit is contained in:
@@ -473,7 +473,8 @@ static int _ftb_check_phrase(const byte *s0, const byte *e0,
|
||||
for (;;)
|
||||
{
|
||||
n_word= (FT_WORD *)phrase_element->data;
|
||||
if (my_strnncoll(cs, h_word.pos, h_word.len, n_word->pos, n_word->len))
|
||||
if (my_strnncoll(cs, (const uchar *) h_word.pos, h_word.len,
|
||||
(const uchar *) n_word->pos, n_word->len))
|
||||
break;
|
||||
if (! (phrase_element= phrase_element->next))
|
||||
DBUG_RETURN(1);
|
||||
|
Reference in New Issue
Block a user