diff --git a/mysql-test/r/bugfix_discard_tablespace_with_unclear_error.result b/mysql-test/r/bugfix_discard_tablespace_with_unclear_error.result
new file mode 100644
index 00000000000..48ab87bbbf3
--- /dev/null
+++ b/mysql-test/r/bugfix_discard_tablespace_with_unclear_error.result
@@ -0,0 +1,27 @@
+#
+# prepare for test
+#
+CREATE TABLE t1(c1 YEAR KEY,c2 INT,c3 BINARY);
+#
+# there is no 'error 155' in master-error.log
+#
+include/assert_grep.inc [Got error 155 when reading table]
+#
+# discard the tablespace and select the data in table
+#
+ALTER TABLE t1 DISCARD TABLESPACE;
+SELECT hex(c1),hex(c2) FROM t1 ORDER BY c1 DESC;
+ERROR HY000: Tablespace has been discarded for table 't1'
+#
+# we expect there is no 'error 155' in master-error.log
+#
+include/assert_grep.inc [Got error 155 when reading table]
+#
+# we have a more clear error message in master-error.log
+#
+include/assert_grep.inc ['t2' have no tablespace]
+CALL mtr.add_suppression("\\[Error\\].*The table 't1' doesn't have a corresponding tablespace.*");
+#
+# end of the test
+#
+DROP TABLE t1;