summaryrefslogtreecommitdiff
path: root/sql/table.cc
diff options
context:
space:
mode:
authorOleksandr Byelkin <sanja@mariadb.com>2018-08-03 23:26:26 +0200
committerOleksandr Byelkin <sanja@mariadb.com>2018-08-03 23:26:26 +0200
commitaffdd79c69dfe443cb9fda06ef156243e1967ac3 (patch)
tree75ebc329bbe3d6714e333335d590ecfebd12679e /sql/table.cc
parente6a808bec790fdbbf1dc0a6b03fb6c8b6e41dc01 (diff)
parent701f0b8e366f957e8256e4741ca48424c84b7234 (diff)
downloadmariadb-git-affdd79c69dfe443cb9fda06ef156243e1967ac3.tar.gz
Merge branch '10.1' into 10.2
Diffstat (limited to 'sql/table.cc')
-rw-r--r--sql/table.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/table.cc b/sql/table.cc
index 6a19b1ebdbc..201901fd46f 100644
--- a/sql/table.cc
+++ b/sql/table.cc
@@ -2043,7 +2043,7 @@ int TABLE_SHARE::init_from_binary_frm_image(THD *thd, bool write,
keyinfo= share->key_info;
uint primary_key= my_strcasecmp(system_charset_info, share->keynames.type_names[0],
primary_key_name) ? MAX_KEY : 0;
- KEY* key_first_info;
+ KEY* key_first_info= NULL;
if (primary_key >= MAX_KEY && keyinfo->flags & HA_NOSAME)
{