diff options
| author | unknown <monty@donna.mysql.com> | 2001-02-17 14:21:51 +0200 |
|---|---|---|
| committer | unknown <monty@donna.mysql.com> | 2001-02-17 14:21:51 +0200 |
| commit | d83e79ce76d77cfdf2b5589e053df988b90f17d7 (patch) | |
| tree | d8dddb439992f4702f5e6227ba57fd16c79770c7 /myisam | |
| parent | 3d30ff09fd589e6229a3109a96f4f0fc477b3ace (diff) | |
| parent | 2662b59306ef0cd495fa6e2edf7129e58a11393a (diff) | |
| download | mariadb-git-d83e79ce76d77cfdf2b5589e053df988b90f17d7.tar.gz | |
Merge work:/my/mysql into donna.mysql.com:/home/my/bk/mysql
configure.in:
Auto merged
Docs/manual.texi:
Auto merged
Diffstat (limited to 'myisam')
| -rw-r--r-- | myisam/mi_check.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/myisam/mi_check.c b/myisam/mi_check.c index d1429b35a87..ec87563981c 100644 --- a/myisam/mi_check.c +++ b/myisam/mi_check.c @@ -3178,7 +3178,7 @@ my_bool mi_test_if_sort_rep(MI_INFO *info, ha_rows rows, is very time-consuming process, it's better to leave it to repair stage but this repair shouldn't be repair_by_sort (serg) */ - if (!force && mi_too_big_key_for_sort(key,rows) || + if ((!force && mi_too_big_key_for_sort(key,rows)) || (key->flag & HA_FULLTEXT)) return FALSE; } |