diff options
| author | unknown <andrey@example.com> | 2006-10-11 11:48:33 +0200 |
|---|---|---|
| committer | unknown <andrey@example.com> | 2006-10-11 11:48:33 +0200 |
| commit | 28eb8e2195c26fff0e6b77410b6f1100ef4a9540 (patch) | |
| tree | 34f1fd0790fd117eab3c2aebfa9987b3361d975d /storage | |
| parent | 525a7cb53b9091c40aa0bfa921b7e764167b0255 (diff) | |
| parent | ca3cafc006c2efde96ed99188ce9297e358e4948 (diff) | |
| download | mariadb-git-28eb8e2195c26fff0e6b77410b6f1100ef4a9540.tar.gz | |
Merge example.com:/work/bug23074/my50-bug23074
into example.com:/work/bug23074/my51-bug23074
storage/myisam/sort.c:
SCCS merged
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/myisam/sort.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/myisam/sort.c b/storage/myisam/sort.c index 099c3173396..9d7eda9f5ba 100644 --- a/storage/myisam/sort.c +++ b/storage/myisam/sort.c @@ -324,7 +324,7 @@ pthread_handler_t thr_find_all_keys(void *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; @@ -517,7 +517,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; |