diff options
| author | Sachin <sachin.setiya@mariadb.com> | 2019-02-25 13:42:43 +0530 |
|---|---|---|
| committer | Sachin <sachin.setiya@mariadb.com> | 2019-02-25 13:42:43 +0530 |
| commit | 5ddae0e0551bfaa64187ab6f3738065475310c79 (patch) | |
| tree | 444b449d5827ff21344930d5982967f31ae6f075 /sql/table.cc | |
| parent | 9011fa1ace3c6a49afdf05c714844d938a8c6f99 (diff) | |
| download | mariadb-git-bb-10.4-release-long_unique.tar.gz | |
Fix Inndb alter table and fix innodb not null long unique.bb-10.4-release-long_unique
Also make long_unique a universal test so that it can be used for innodb,
myisam and other storage engine in future.
Diffstat (limited to 'sql/table.cc')
| -rw-r--r-- | sql/table.cc | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/sql/table.cc b/sql/table.cc index 13f4e200e2f..ad640553bcb 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -824,7 +824,7 @@ static bool create_key_infos(const uchar *strpos, const uchar *frm_image_end, } if (keyinfo->algorithm == HA_KEY_ALG_LONG_HASH) { - keyinfo->key_length= HA_HASH_KEY_LENGTH_WITHOUT_NULL; + keyinfo->key_length= HA_HASH_KEY_LENGTH_WITH_NULL; //Storing key hash key_part++; } @@ -1218,11 +1218,7 @@ bool parse_vcol_defs(THD *thd, MEM_ROOT *mem_root, TABLE *table, field->vcol_info->expr= hash_item; key->user_defined_key_parts= key->ext_key_parts= key->usable_key_parts= 1; key->key_part+= parts; - - if (key->flags & HA_NULL_PART_KEY) - key->key_length= HA_HASH_KEY_LENGTH_WITH_NULL; - else - key->key_length= HA_HASH_KEY_LENGTH_WITHOUT_NULL; + key->key_length= HA_HASH_KEY_LENGTH_WITH_NULL; *(vfield_ptr++)= *field_ptr; } |