diff options
| author | unknown <monty@mysql.com> | 2004-05-19 05:09:10 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-05-19 05:09:10 +0300 |
| commit | a41883facfdda411441cc868d2af278360c3dbe5 (patch) | |
| tree | 57ccf880c409f526096a1fbd30b165d14a22f473 /myisam | |
| parent | 3fba03f345e0d121280e38e64cf74016ab9af474 (diff) | |
| download | mariadb-git-a41883facfdda411441cc868d2af278360c3dbe5.tar.gz | |
Portability fixes
Fixed wrong number of warnings/duplicates for machines with high-byte-first
client/mysql.cc:
Remove not used variables
client/mysqltest.c:
Remove double ;
myisam/ft_nlq_search.c:
Fix valgrind error (not fatal)
myisam/rt_test.c:
Portability fix
mysql-test/r/rpl_trunc_binlog.result:
Portability fix
mysql-test/t/rpl_trunc_binlog.test:
Portability fix
(Column 23 was different on openbsd)
sql/sql_insert.cc:
Fixed wrong number of warnings/duplicates for machines with high-byte-first
strings/ctype-big5.c:
Portability fix
strings/ctype-gbk.c:
Portability fix
strings/ctype-mb.c:
Portability fix
strings/ctype-uca.c:
Portability fix
tests/client_test.c:
Portability fixes
Diffstat (limited to 'myisam')
| -rw-r--r-- | myisam/ft_nlq_search.c | 5 | ||||
| -rw-r--r-- | myisam/rt_test.c | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/myisam/ft_nlq_search.c b/myisam/ft_nlq_search.c index 9b42d51ab55..c9caf4f39af 100644 --- a/myisam/ft_nlq_search.c +++ b/myisam/ft_nlq_search.c @@ -90,8 +90,9 @@ static int walk_and_match(FT_WORD *word, uint32 count, ALL_IN_ONE *aio) /* Skip rows inserted by current inserted */ for (r=_mi_search(info, keyinfo, keybuff, keylen, SEARCH_FIND, key_root) ; - (subkeys=ft_sintXkorr(info->lastkey+info->lastkey_length-extra)) > 0 && - !r && info->lastpos >= info->state->data_file_length ; + !r && + (subkeys=ft_sintXkorr(info->lastkey+info->lastkey_length-extra)) > 0 && + info->lastpos >= info->state->data_file_length ; r= _mi_search_next(info, keyinfo, info->lastkey, info->lastkey_length, SEARCH_BIGGER, key_root)) ; diff --git a/myisam/rt_test.c b/myisam/rt_test.c index c1126c1939a..41cc56d4d78 100644 --- a/myisam/rt_test.c +++ b/myisam/rt_test.c @@ -39,7 +39,7 @@ int main(int argc __attribute__((unused)),char *argv[] __attribute__((unused))) } -int run_test(const char *filename) +static int run_test(const char *filename) { MI_INFO *file; MI_UNIQUEDEF uniquedef; |