database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Portability fixes

Browse Source 
myisam/ft_boolean_search.c:
  Portability fix
mysql-test/mysql-test-run.sh:
  Added slave_net_timeout
mysql-test/r/func_if.result:
  Updated results after merge from 3.23
mysql-test/r/func_test.result:
  Updated results after merge from 3.23
mysql-test/r/innodb.result:
  Updated results after merge from 3.23
mysql-test/r/show_check.result:
  Updated results after merge from 3.23
mysql-test/r/variables.result:
  Updated results after merge from 3.23
This commit is contained in:
unknown
2002-04-26 08:56:28 +03:00
parent 18e6569769
commit cacfcb6404
7 changed files with 39 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
myisam/ft_boolean_search.c
View File

@ -264,7 +264,8 @@ FT_INFO * ft_init_boolean_search(MI_INFO *info, uint keynr, byte *query,
ftbe->weight=1;
ftbe->flags=FTB_FLAG_YES;
ftbe->nos=1;
ftbe->quot=ftbe->up=0;
ftbe->quot=0;
ftbe->up=0;
ftbe->ythresh=ftbe->yweaks=0;
ftbe->docid[0]=ftbe->docid[1]=HA_POS_ERROR;
ftb->root=ftbe;
@ -288,12 +289,14 @@ int _ftb_strstr(const byte *s0, const byte *e0,
while (s0 < e0)
{
while (s0 < e0 && cs->to_upper[*s0++] != cs->to_upper[*s1])
while (s0 < e0 && cs->to_upper[(uint) (uchar) *s0++] !=
cs->to_upper[(uint) (uchar) *s1])
/* no-op */;
if (s0 >= e0)
return 0;
p=s1+1;
while (s0 < e0 && p < e1 && cs->to_upper[*s0++] == cs->to_upper[*p++])
while (s0 < e0 && p < e1 && cs->to_upper[(uint) (uchar) *s0++] ==
cs->to_upper[(uint) (uchar) *p++])
/* no-op */;
if (p >= e1)
return 1;