merge

3 files changed, 16 insertions, 3 deletions

diff --git a/mysql-test/r/subselect.result b/mysql-test/r/subselect.result
index 99827238540..98adbc19eeb 100644
--- a/mysql-test/r/subselect.result
+++ b/mysql-test/r/subselect.result
@@ -2026,3 +2026,8 @@ select count(distinct id) from t1 where id in (select id from t2 where match(bod
 count(distinct id)
 1
 drop table t2,t1;
+create table t1 (s1 int,s2 int);
+insert into t1 values (20,15);
+select * from t1 where  (('a',null) <=> (select 'a',s2 from t1 where s1 = 0));
+s1	s2
+drop table t1;
diff --git a/mysql-test/t/subselect.test b/mysql-test/t/subselect.test
index b76f5140e78..e78874453b9 100644
--- a/mysql-test/t/subselect.test
+++ b/mysql-test/t/subselect.test
@@ -1328,3 +1328,11 @@ insert into t1 values(1),(2),(3);
 insert into t2 values (1,'test'), (2,'mysql'), (3,'test'), (4,'test');
 select count(distinct id) from t1 where id in (select id from t2 where match(body) against ('mysql' in boolean mode));
 drop table t2,t1;
+
+#
+# Equal operation under row and empty subquery
+#
+create table t1 (s1 int,s2 int);
+insert into t1 values (20,15);
+select * from t1 where  (('a',null) <=> (select 'a',s2 from t1 where s1 = 0));
+drop table t1;
diff --git a/sql/item.h b/sql/item.h
index ccb0fda1c49..3c4f80e3857 100644
--- a/sql/item.h
+++ b/sql/item.h
@@ -1127,7 +1127,7 @@ class Item_cache_int: public Item_cache
 {
   longlong value;
 public:
-  Item_cache_int(): Item_cache() {}
+  Item_cache_int(): Item_cache(), value(0) {}
   
   void store(Item *item);
   double val() { DBUG_ASSERT(fixed == 1); return (double) value; }
@@ -1145,7 +1145,7 @@ class Item_cache_real: public Item_cache
 {
   double value;
 public:
-  Item_cache_real(): Item_cache() {}
+  Item_cache_real(): Item_cache(), value(0) {}
 
   void store(Item *item);
   double val() { DBUG_ASSERT(fixed == 1); return value; }
@@ -1167,7 +1167,7 @@ class Item_cache_str: public Item_cache
   char buffer[80];
   String *value, value_buff;
 public:
-  Item_cache_str(): Item_cache() { }
+  Item_cache_str(): Item_cache(), value(0) { }
   
   void store(Item *item);
   double val();