summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2019-04-08 21:38:13 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2019-04-08 21:38:13 +0300
commit9ba0865b875c8b11a3ca26c9ee17635961d18b23 (patch)
tree8d33042f9b00bbd5d6894d93607de62649c6c7a2 /sql
parentcc492bfd4ff2d15cc5803a7d80f1559ceeb003c1 (diff)
parent7362f115543d34b1d3f06e61be9235b30c0abc8a (diff)
downloadmariadb-git-9ba0865b875c8b11a3ca26c9ee17635961d18b23.tar.gz
Merge 10.2 into 10.3
Diffstat (limited to 'sql')
-rw-r--r--sql/sql_table.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index a28d5807ce4..c7ec0dd99ef 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -6286,7 +6286,7 @@ drop_create_field:
Key_part_spec *kp;
if ((kp= part_it++))
chkname= kp->field_name.str;
- if (keyname == NULL)
+ if (chkname == NULL)
continue;
}
if (key->type == chk_key->type &&