Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1

into  mysql.com:/usr/home/ram/work/mysql-4.1

2 files changed, 9 insertions, 12 deletions

diff --git a/mysql-test/t/func_in.test b/mysql-test/t/func_in.test
index 3481f2c7b11..2ffe5a2d5f7 100644
--- a/mysql-test/t/func_in.test
+++ b/mysql-test/t/func_in.test
@@ -109,16 +109,4 @@ select count(*) from t1 where id not in (1);
 select count(*) from t1 where id not in (1,2);
 drop table t1;
 
-#
-# Bug#18360 Incorrect type coercion in IN() results in false comparison
-#
-create table t1 (f1 char(1), f2 int);
-insert into t1 values (1,0),('a',1),('z',2);
-select f1 from t1 where f1 in (1,'z');
-select f2 from t1 where f2 in (1,'z');
-select f1 from t1 where 'z' in (1,f1);
-select * from t1 where 'z' in (f2,f1);
-select * from t1 where 1 in (f2,f1);
-drop table t1;
-
 # End of 4.1 tests
diff --git a/mysql-test/t/myisam.test b/mysql-test/t/myisam.test
index 7e4cc324b12..5f948973141 100644
--- a/mysql-test/t/myisam.test
+++ b/mysql-test/t/myisam.test
@@ -705,4 +705,13 @@ select count(*)   from t1 where id2 = 10;
 select count(id1) from t1 where id2 = 10;
 drop table t1;
 
+#
+# BUG#18036 - update of table joined to self reports table as crashed
+#
+CREATE TABLE t1(a CHAR(9), b VARCHAR(7)) ENGINE=MyISAM;
+INSERT INTO t1(a) VALUES('xxxxxxxxx'),('xxxxxxxxx');
+UPDATE t1 AS ta1,t1 AS ta2 SET ta1.b='aaaaaa',ta2.b='bbbbbb';
+SELECT * FROM t1;
+DROP TABLE t1;
+
 # End of 4.1 tests