mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Portability fix.
Fixed linking problem with InnoDB. BUILD/compile-alpha-cxx: Fix for using innodb acinclude.m4: Fix problem with linking mysqld after Heikkis last changes. client/mysql.cc: Fixed linking problem client/mysqlmanager-pwgen.c: Portability fix innobase/que/que0que.c: Removed some blanks myisam/ft_boolean_search.c: Portability fix myisam/sort.c: Portability fix mysys/queues.c: Portability fix strings/ctype-latin1_de.c: Portability fix tools/mysqlmanager.c: Portability fix
This commit is contained in:
@ -163,13 +163,14 @@ void _ftb_init_index_search(FT_INFO *ftb)
|
||||
{
|
||||
ftbw=(FTB_WORD *)(ftb->queue.root[i]);
|
||||
|
||||
r=_mi_search(info, keyinfo, ftbw->word, ftbw->len,
|
||||
r=_mi_search(info, keyinfo, (uchar*) ftbw->word, ftbw->len,
|
||||
SEARCH_FIND | SEARCH_PREFIX, keyroot);
|
||||
if (!r)
|
||||
{
|
||||
r=_mi_compare_text(default_charset_info,
|
||||
info->lastkey+ftbw->trunc,ftbw->len-ftbw->trunc,
|
||||
ftbw->word+ftbw->trunc,ftbw->len-ftbw->trunc,0);
|
||||
(uchar*) ftbw->word+ftbw->trunc,ftbw->len-ftbw->trunc,
|
||||
0);
|
||||
}
|
||||
if (r) /* not found */
|
||||
{
|
||||
@ -306,13 +307,14 @@ int ft_boolean_read_next(FT_INFO *ftb, char *record)
|
||||
_ftb_climb_the_tree(ftbw, curdoc);
|
||||
|
||||
/* update queue */
|
||||
r=_mi_search(info, keyinfo, ftbw->word, USE_WHOLE_KEY,
|
||||
r=_mi_search(info, keyinfo, (uchar*) ftbw->word, USE_WHOLE_KEY,
|
||||
SEARCH_BIGGER , keyroot);
|
||||
if (!r)
|
||||
{
|
||||
r=_mi_compare_text(default_charset_info,
|
||||
info->lastkey+ftbw->trunc,ftbw->len-ftbw->trunc,
|
||||
ftbw->word+ftbw->trunc,ftbw->len-ftbw->trunc,0);
|
||||
(uchar*) ftbw->word+ftbw->trunc,
|
||||
ftbw->len-ftbw->trunc,0);
|
||||
}
|
||||
if (r) /* not found */
|
||||
{
|
||||
|
Reference in New Issue
Block a user