diff options
| author | andrey@example.com <> | 2006-10-11 11:14:42 +0200 |
|---|---|---|
| committer | andrey@example.com <> | 2006-10-11 11:14:42 +0200 |
| commit | dfa7dbf241afad9bcbf126b2dfc91f5d857e10f6 (patch) | |
| tree | 991c05196bd742fb5127f1c650743156e8be60e8 /myisam/sort.c | |
| parent | 438ffa81fb50fdaf38fa82158060862a29c5f074 (diff) | |
| parent | a846909e6a4bd726c1ec5cc6e9df467431285157 (diff) | |
| download | mariadb-git-dfa7dbf241afad9bcbf126b2dfc91f5d857e10f6.tar.gz | |
Merge example.com:/work/bug23074/my41-bug23074
into example.com:/work/bug23074/my50-bug23074
Diffstat (limited to 'myisam/sort.c')
| -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 00fbfe768dc..74e0d973c9c 100644 --- a/myisam/sort.c +++ b/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; @@ -516,7 +516,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; |