bk commit into 5.0 tree (evgen:1.2085)

[eugene]

Below is the list of changes that have just been committed into a local
5.0 repository of evgen. When evgen does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2085 06/03/14 15:33:13 evgen@stripped +2 -0
  Merge epotemkin@stripped:/home/bk/mysql-5.0
  into sunlight.local:/work_local/17336-bug-5.0-mysql

  mysql-test/t/subselect.test
    1.115 06/03/14 15:33:11 evgen@stripped +0 -0
    Auto merged

  mysql-test/r/subselect.result
    1.136 06/03/14 15:33:11 evgen@stripped +0 -0
    Auto merged

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	evgen
# Host:	sunlight.local
# Root:	/work_local/17336-bug-5.0-mysql/RESYNC

--- 1.135/mysql-test/r/subselect.result	2006-02-24 19:34:08 +03:00
+++ 1.136/mysql-test/r/subselect.result	2006-03-14 15:33:11 +03:00
@@ -3156,3 +3156,10 @@ id	select_type	table	type	possible_keys	
 1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	9	Using where
 2	DEPENDENT SUBQUERY	t1	index	NULL	a	8	NULL	9	Using filesort
 DROP TABLE t1;
+create table t1( f1 int,f2 int);
+insert into t1 values (1,1),(2,2);
+select tt.t from (select 'crash1' as t, f2 from t1) as tt left join t1 on tt.t = 'crash2'
and tt.f2 = t1.f2 where tt.t = 'crash1';
+t
+crash1
+crash1
+drop table t1;

--- 1.114/mysql-test/t/subselect.test	2006-02-24 19:34:08 +03:00
+++ 1.115/mysql-test/t/subselect.test	2006-03-14 15:33:11 +03:00
@@ -2067,3 +2067,10 @@ SELECT * FROM t1 WHERE (a,b) = ANY (SELE
 
 DROP TABLE t1;
 
+#
+# Bug#17366: Unchecked Item_int results in server crash
+#
+create table t1( f1 int,f2 int);
+insert into t1 values (1,1),(2,2);
+select tt.t from (select 'crash1' as t, f2 from t1) as tt left join t1 on tt.t = 'crash2'
and tt.f2 = t1.f2 where tt.t = 'crash1';
+drop table t1;