select.result, item.cc:

  After merge fix for bug#13356


sql/item.cc:
  After merge fix for bug#13356
mysql-test/r/select.result:
  After merge fix for bug#13356

mysql-test/r/select.result

@@ -2620,6 +2620,15 @@ select found_rows();
 found_rows()
 1
 DROP TABLE t1;
+create table t1(f1 int, f2 int);
+create table t2(f3 int);
+select f1 from t1,t2 where f1=f2 and (f1,f2) = ((1,1));
+f1
+select f1 from t1,t2 where f1=f2 and (f1,NULL) = ((1,1));
+f1
+select f1 from t1,t2 where f1=f2 and (f1,f2) = ((1,NULL));
+f1
+drop table t1,t2;
 CREATE TABLE t1 ( city char(30) );
 INSERT INTO t1 VALUES ('London');
 INSERT INTO t1 VALUES ('Paris');
@@ -3029,12 +3038,3 @@ id
 102
 drop table t1, t2;
 drop view v1, v2, v3;
-create table t1(f1 int, f2 int);
-create table t2(f3 int);
-select f1 from t1,t2 where f1=f2 and (f1,f2) = ((1,1));
-f1
-select f1 from t1,t2 where f1=f2 and (f1,NULL) = ((1,1));
-f1
-select f1 from t1,t2 where f1=f2 and (f1,f2) = ((1,NULL));
-f1
-drop table t1,t2;

sql/item.cc

@@ -5255,6 +5255,7 @@ void resolve_const_item(THD *thd, Item **ref, Item *comp_item)
         }
       }
     }
+    break;
   }
   case REAL_RESULT:
   {						// It must REAL_RESULT
@@ -5276,7 +5277,6 @@ void resolve_const_item(THD *thd, Item **ref, Item *comp_item)
                (Item*) new Item_decimal(name, result, length, decimals));
     break;
   }
-  case ROW_RESULT:
   default:
     DBUG_ASSERT(0);
   }