mirror of
https://github.com/MariaDB/server.git
synced 2025-01-29 18:20:07 +01:00
Merge example.com:/work/bug23074/my41-bug23074
into example.com:/work/bug23074/my50-bug23074 myisam/sort.c: Auto merged
This commit is contained in:
commit
ca3cafc006
1 changed files with 2 additions and 2 deletions
|
@ -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;
|
||||
|
|
Loading…
Add table
Reference in a new issue