Commit a846909e authored by andrey@example.com's avatar andrey@example.com

Fix a typo regarding checking whether HA_VAR_LENGTH_KEY is

set. This has always worked because when flag is !=0 then
HA_VAR_LENGTH_KEY is always set. Therefore, a test case cannot
reveal a faulty behavior.

Fix for bug#23074: typo in myisam/sort.c
parent 4812d81e
...@@ -324,7 +324,7 @@ pthread_handler_decl(thr_find_all_keys,arg) ...@@ -324,7 +324,7 @@ pthread_handler_decl(thr_find_all_keys,arg)
if (info->sort_info->got_error) if (info->sort_info->got_error)
goto err; 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->write_keys=write_keys_varlen;
info->read_to_buffer=read_to_buffer_varlen; info->read_to_buffer=read_to_buffer_varlen;
...@@ -513,7 +513,7 @@ int thr_write_keys(MI_SORT_PARAM *sort_param) ...@@ -513,7 +513,7 @@ int thr_write_keys(MI_SORT_PARAM *sort_param)
{ {
if (got_error) if (got_error)
continue; continue;
if (sinfo->keyinfo->flag && HA_VAR_LENGTH_KEY) if (sinfo->keyinfo->flag & HA_VAR_LENGTH_KEY)
{ {
sinfo->write_keys=write_keys_varlen; sinfo->write_keys=write_keys_varlen;
sinfo->read_to_buffer=read_to_buffer_varlen; sinfo->read_to_buffer=read_to_buffer_varlen;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment