Post-merge fixes part #1.

mysql-test/t/subselect4.test

@@ -666,7 +666,6 @@ INSERT INTO t2 VALUES ('f'),('d');
 SET @old_optimizer_switch = @@session.optimizer_switch;
 SET SESSION optimizer_switch = 'materialization=on,in_to_exists=off,';
 
-select sin(0);
 EXPLAIN
 SELECT * FROM t1
 WHERE f3 = (

sql/sql_select.cc

@@ -9114,7 +9114,10 @@ void JOIN_TAB::cleanup()
     if (table->pos_in_table_list && 
         table->pos_in_table_list->jtbm_subselect)
     {
+      end_read_record(&read_record);
+      //psergey-merge:
       table->pos_in_table_list->jtbm_subselect->cleanup();
+      return;
     }
     /*
       We need to reset this for next select