Merge polly.(none):/home/kaa/src/opt/bug32103/my51-bug26215

into  polly.(none):/home/kaa/src/opt/mysql-5.1-opt

1 files changed, 21 insertions, 0 deletions

diff --git a/mysql-test/t/select.test b/mysql-test/t/select.test
index ceb920c6ce4..eebf4a1d5ab 100644
--- a/mysql-test/t/select.test
+++ b/mysql-test/t/select.test
@@ -2361,6 +2361,27 @@ insert into t1 values (0xfffffffffffffffff, 0xfffffffffffffffff),
 select hex(a), hex(b) from t1;
 drop table t1;
 
+#
+# Bug #32103: optimizer crash when join on int and mediumint with variable in 
+#             where clause
+#
+
+CREATE TABLE t1 (c0 int);
+CREATE TABLE t2 (c0 int);
+
+# We need any variable that:
+# 1. has integer type, 
+# 2. can be used with the "@@name" syntax
+# 3. available in every server build
+INSERT INTO t1 VALUES(@@connect_timeout);
+INSERT INTO t2 VALUES(@@connect_timeout);
+
+# We only need to ensure 1 row is returned to validate the results
+--replace_column 1 X 2 X
+SELECT * FROM t1 JOIN t2 ON t1.c0 = t2.c0 WHERE (t1.c0 <=> @@connect_timeout);
+
+DROP TABLE t1, t2;
+
 --echo End of 4.1 tests
 
 #