diff --git a/mysql-test/r/ndb_partition_key.result b/mysql-test/r/ndb_partition_key.result
index 87b019c83e2..8225fca7a54 100644
--- a/mysql-test/r/ndb_partition_key.result
+++ b/mysql-test/r/ndb_partition_key.result
@@ -165,3 +165,21 @@ ENGINE=NDB
 PARTITION BY KEY(c3) PARTITIONS 5;
 ALTER TABLE t1 COALESCE PARTITION 4;
 DROP TABLE t1;
+CREATE TABLE t1 (
+c1 MEDIUMINT NOT NULL AUTO_INCREMENT,
+c2 TEXT NOT NULL,
+c3 INT NOT NULL,
+PRIMARY KEY(c1,c3))
+ENGINE=NDB
+PARTITION BY KEY(c3) PARTITIONS 5;
+ALTER TABLE t1 ADD COLUMN c4 INT AFTER c1;
+DROP TABLE t1;
+CREATE TABLE t1 (
+c1 MEDIUMINT NOT NULL AUTO_INCREMENT,
+c2 TEXT NOT NULL,
+c3 INT NOT NULL,
+PRIMARY KEY(c1,c3))
+ENGINE=NDB
+PARTITION BY KEY(c3);
+ALTER TABLE t1 ADD COLUMN c4 INT AFTER c1;
+DROP TABLE t1;
diff --git a/mysql-test/t/ndb_partition_key.test b/mysql-test/t/ndb_partition_key.test
index d43dc7e49e4..87933671529 100644
--- a/mysql-test/t/ndb_partition_key.test
+++ b/mysql-test/t/ndb_partition_key.test
@@ -153,3 +153,28 @@ b'0',
 ALTER TABLE t1 COALESCE PARTITION 4;
 
 DROP TABLE t1;
+
+#
+# BUG 16806: ALTER TABLE fails
+#
+CREATE TABLE t1 (
+  c1 MEDIUMINT NOT NULL AUTO_INCREMENT,
+  c2 TEXT NOT NULL,
+  c3 INT NOT NULL,
+  PRIMARY KEY(c1,c3))
+  ENGINE=NDB
+  PARTITION BY KEY(c3) PARTITIONS 5;
+
+ALTER TABLE t1 ADD COLUMN c4 INT AFTER c1;
+DROP TABLE t1;
+
+CREATE TABLE t1 (
+  c1 MEDIUMINT NOT NULL AUTO_INCREMENT,
+  c2 TEXT NOT NULL,
+  c3 INT NOT NULL,
+  PRIMARY KEY(c1,c3))
+  ENGINE=NDB
+  PARTITION BY KEY(c3);
+
+ALTER TABLE t1 ADD COLUMN c4 INT AFTER c1;
+DROP TABLE t1;