diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-11-03 19:11:36 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-11-03 19:11:36 +0200 |
| commit | c498250888ec126fddda2867d1239b2a7734482f (patch) | |
| tree | e308174c977c0981d8e36f6f9b791b1b266d0cb0 /storage/myisam/mi_key.c | |
| parent | 09a1f0075a8d5752dd7b2940a20d86a040af1741 (diff) | |
| parent | 1418439d3823fe059b41092af72ab32d5e7cd7ab (diff) | |
| download | mariadb-git-10.6-vatu.tar.gz | |
Merge 10.5 into 10.6mariadb-10.5.7bb-10.6-georg10.6-vatu
Diffstat (limited to 'storage/myisam/mi_key.c')
| -rw-r--r-- | storage/myisam/mi_key.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/storage/myisam/mi_key.c b/storage/myisam/mi_key.c index ed72acf627e..087eb59c7c0 100644 --- a/storage/myisam/mi_key.c +++ b/storage/myisam/mi_key.c @@ -147,8 +147,11 @@ uint _mi_make_key(register MI_INFO *info, uint keynr, uchar *key, set_if_smaller(length,tmp_length); FIX_LENGTH(cs, pos, length, char_length); store_key_length_inc(key,char_length); - memcpy(key, pos, char_length); - key+= char_length; + if (char_length) + { + memcpy(key, pos, char_length); + key+= char_length; + } continue; } else if (keyseg->flag & HA_SWAP_KEY) |