diff options
| author | ramil/ram@mysql.com/myoffice.izhnet.ru <> | 2006-10-19 16:15:30 +0500 |
|---|---|---|
| committer | ramil/ram@mysql.com/myoffice.izhnet.ru <> | 2006-10-19 16:15:30 +0500 |
| commit | f6ea36c3a5e38654b7e7c69ff6ff04cdfe298397 (patch) | |
| tree | 86c6c0aa08ccf4c172196dfc0d398e73fd46bd93 /sql/sql_select.cc | |
| parent | 3a709f50b27acf9bce0fd6e5ddcd45ae2f277bee (diff) | |
| parent | 0027b6e4b772a6b90ed67048451f3455aacfbf5d (diff) | |
| download | mariadb-git-f6ea36c3a5e38654b7e7c69ff6ff04cdfe298397.tar.gz | |
Merge mysql.com:/usr/home/ram/work/bug20732/my41-bug20732
into mysql.com:/usr/home/ram/work/bug20732/my50-bug20732
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 6d17faf8509..b1354a7a457 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -11428,7 +11428,7 @@ part_of_refkey(TABLE *table,Field *field) for (uint part=0 ; part < ref_parts ; part++,key_part++) if (field->eq(key_part->field) && - !(key_part->key_part_flag & HA_PART_KEY_SEG)) + !(key_part->key_part_flag & (HA_PART_KEY_SEG | HA_NULL_PART))) return table->reginfo.join_tab->ref.items[part]; } return (Item*) 0; |