diff --git a/mysql-test/r/ctype_eucjpms.result b/mysql-test/r/ctype_eucjpms.result
index a07ff9b28be..cdb28cd0fdd 100755
--- a/mysql-test/r/ctype_eucjpms.result
+++ b/mysql-test/r/ctype_eucjpms.result
@@ -9785,6 +9785,20 @@ DROP TABLE t1;
 DROP TABLE t2;
 DROP TABLE t3;
 DROP TABLE t4;
+CREATE TABLE t1(c1 varchar(10)) default character set = eucjpms;
+insert into t1 values(_ucs2 0x00F7);
+insert into t1 values(_eucjpms 0xA1E0);
+insert into t1 values(_ujis 0xA1E0);
+insert into t1 values(_sjis 0x8180);
+insert into t1 values(_cp932 0x8180);
+SELECT HEX(c1) FROM t1;
+HEX(c1)
+A1E0
+A1E0
+A1E0
+A1E0
+A1E0
+DROP TABLE t1;
 SET collation_connection='eucjpms_japanese_ci';
 create table t1 select repeat('a',4000) a;
 delete from t1;
diff --git a/mysql-test/t/ctype_eucjpms.test b/mysql-test/t/ctype_eucjpms.test
index cec1e2a9861..3609407fe96 100644
--- a/mysql-test/t/ctype_eucjpms.test
+++ b/mysql-test/t/ctype_eucjpms.test
@@ -346,6 +346,18 @@ DROP TABLE t2;
 DROP TABLE t3;
 DROP TABLE t4;
 
+#Test bug#11717
+CREATE TABLE t1(c1 varchar(10)) default character set = eucjpms;
+
+insert into t1 values(_ucs2 0x00F7);
+insert into t1 values(_eucjpms 0xA1E0);
+insert into t1 values(_ujis 0xA1E0);
+insert into t1 values(_sjis 0x8180);
+insert into t1 values(_cp932 0x8180);
+
+SELECT HEX(c1) FROM t1;
+
+DROP TABLE t1;
 
 SET collation_connection='eucjpms_japanese_ci';
 -- source include/ctype_filesort.inc
diff --git a/strings/ctype-eucjpms.c b/strings/ctype-eucjpms.c
index 58caac15256..2ab103d65ac 100644
--- a/strings/ctype-eucjpms.c
+++ b/strings/ctype-eucjpms.c
@@ -1584,7 +1584,7 @@ static uint16 tab_uni_jisx02082[]={
 
 /* page 3 0x00F7-0x00F7 */
 static uint16 tab_uni_jisx02083[]={
-0x07};
+0x2160};
 
 /* page 4 0x0391-0x03C9 */
 static uint16 tab_uni_jisx02084[]={