diff options
| author | unknown <andrey@example.com> | 2006-10-11 13:58:31 +0200 |
|---|---|---|
| committer | unknown <andrey@example.com> | 2006-10-11 13:58:31 +0200 |
| commit | 175209d249e2c8fb59abec33a616982f48664c03 (patch) | |
| tree | be776e4c9a5cff653b7a162006755032ccc8dc10 /myisam | |
| parent | 18b91b023d5145cc900a503b168414abd11f3650 (diff) | |
| parent | a4a319cf0c266aadac0442a7c55dcef2529f8abc (diff) | |
| download | mariadb-git-175209d249e2c8fb59abec33a616982f48664c03.tar.gz | |
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-4.1-maint
into example.com:/work/bug23074/my41-bug23074
Diffstat (limited to 'myisam')
| -rw-r--r-- | myisam/sort.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/myisam/sort.c b/myisam/sort.c index 1a3dc147cd9..364d860272c 100644 --- a/myisam/sort.c +++ b/myisam/sort.c @@ -324,7 +324,7 @@ pthread_handler_decl(thr_find_all_keys,arg) if (info->sort_info->got_error) goto err; - if (info->keyinfo->flag && HA_VAR_LENGTH_KEY) + if (info->keyinfo->flag & HA_VAR_LENGTH_KEY) { info->write_keys=write_keys_varlen; info->read_to_buffer=read_to_buffer_varlen; @@ -513,7 +513,7 @@ int thr_write_keys(MI_SORT_PARAM *sort_param) { if (got_error) continue; - if (sinfo->keyinfo->flag && HA_VAR_LENGTH_KEY) + if (sinfo->keyinfo->flag & HA_VAR_LENGTH_KEY) { sinfo->write_keys=write_keys_varlen; sinfo->read_to_buffer=read_to_buffer_varlen; |