diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-05-22 09:20:20 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-05-22 09:46:51 +0300 |
commit | 70505dd45bd36516206eeeb5dcaa28e5f5a1d6dd (patch) | |
tree | 14d0c4dba49e36dc0d80c1ba99757b4074781d2d /storage/heap | |
parent | 7edadde72eb23e9110db8cea810c023104e9d15e (diff) | |
parent | 13a350ac29eeb43153c7bca65b73b5dfa9f8ffb5 (diff) | |
download | mariadb-git-70505dd45bd36516206eeeb5dcaa28e5f5a1d6dd.tar.gz |
Merge 10.1 into 10.2
Diffstat (limited to 'storage/heap')
-rw-r--r-- | storage/heap/hp_create.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/heap/hp_create.c b/storage/heap/hp_create.c index bb5537c9363..431e992e75b 100644 --- a/storage/heap/hp_create.c +++ b/storage/heap/hp_create.c @@ -1,5 +1,5 @@ /* Copyright (c) 2000, 2011, Oracle and/or its affiliates. - Copyright (c) 2010, 2014, SkySQL Ab. + Copyright (c) 2010, 2017, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -94,7 +94,7 @@ int heap_create(const char *name, HP_CREATE_INFO *create_info, case HA_KEYTYPE_VARBINARY1: /* Case-insensitiveness is handled in coll->hash_sort */ keyinfo->seg[j].type= HA_KEYTYPE_VARTEXT1; - /* fall_through */ + /* fall through */ case HA_KEYTYPE_VARTEXT1: keyinfo->flag|= HA_VAR_LENGTH_KEY; length+= 2; |