summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/ps.result6
-rw-r--r--mysql-test/t/ps.test9
2 files changed, 14 insertions, 1 deletions
diff --git a/mysql-test/r/ps.result b/mysql-test/r/ps.result
index fd3a7d54b4d..e03952efe13 100644
--- a/mysql-test/r/ps.result
+++ b/mysql-test/r/ps.result
@@ -113,3 +113,9 @@ execute stmt1 using @ivar;
?
1234
drop table t1,t2;
+PREPARE stmt1 FROM "select _utf8 'A' collate utf8_bin = ?";
+set @var='A';
+EXECUTE stmt1 USING @var;
+_utf8 'A' collate utf8_bin = ?
+1
+DEALLOCATE PREPARE stmt1;
diff --git a/mysql-test/t/ps.test b/mysql-test/t/ps.test
index d9e0f0852c5..f379fb3eebe 100644
--- a/mysql-test/t/ps.test
+++ b/mysql-test/t/ps.test
@@ -116,4 +116,11 @@ prepare stmt1 from @str2;
execute stmt1 using @ivar;
drop table t1,t2;
-
+#
+# Bug #4105: Server crash on attempt to prepare a statement with character
+# set introducer
+#
+PREPARE stmt1 FROM "select _utf8 'A' collate utf8_bin = ?";
+set @var='A';
+EXECUTE stmt1 USING @var;
+DEALLOCATE PREPARE stmt1;