diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-04-26 08:56:28 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-04-26 08:56:28 +0300 |
| commit | cacfcb6404da497b14fa8484f15ca3832cce8adb (patch) | |
| tree | 7412d050274815c36a164eb72d690b8871014e84 /myisam/ft_boolean_search.c | |
| parent | 18e6569769a62d8d6e1e50670658aee139960181 (diff) | |
| download | mariadb-git-cacfcb6404da497b14fa8484f15ca3832cce8adb.tar.gz | |
Portability fixes
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
Diffstat (limited to 'myisam/ft_boolean_search.c')
| -rw-r--r-- | myisam/ft_boolean_search.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/myisam/ft_boolean_search.c b/myisam/ft_boolean_search.c index cd0d0d9d052..24b585985c0 100644 --- a/myisam/ft_boolean_search.c +++ b/myisam/ft_boolean_search.c @@ -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; |