fixed error handling inside su_select() for multidelete

(BUG#1839)

mysql-test/r/subselect.result

@@ -1569,3 +1569,32 @@ INSERT INTO t2 VALUES (100, 200, 'C');
 SELECT DISTINCT COLC FROM t1 WHERE COLA = (SELECT COLA FROM t2 WHERE COLB = 200 AND COLC ='C' LIMIT 1);
 COLC
 DROP TABLE t1, t2;
+create table t11 (a int NOT NULL, b int, primary key (a));
+create table t12 (a int NOT NULL, b int, primary key (a));
+create table t2 (a int NOT NULL, b int, primary key (a));
+insert into t11 values (0, 10),(1, 11),(2, 12);
+insert into t12 values (33, 10),(22, 11),(2, 12);
+insert into t2 values (1, 21),(2, 12),(3, 23);
+select * from t11;
+a	b
+0	10
+1	11
+2	12
+select * from t12;
+a	b
+33	10
+22	11
+2	12
+select * from t2;
+a	b
+1	21
+2	12
+3	23
+delete t11.*, t12.* from t11,t12 where t11.a = t12.a and t11.b > (select b from t2);
+ERROR 21000: Subquery returns more than 1 row
+select * from t2;
+a	b
+1	21
+2	12
+3	23
+drop table t11, t12, t2;

mysql-test/t/subselect.test

@@ -1008,4 +1008,22 @@ CREATE TABLE t2(COLA FLOAT NOT NULL,COLB FLOAT NOT NULL,COLC CHAR(1) NOT NULL,PR
 INSERT INTO t1 VALUES (1,1,'1A3240'), (1,2,'4W2365');
 INSERT INTO t2 VALUES (100, 200, 'C');
 SELECT DISTINCT COLC FROM t1 WHERE COLA = (SELECT COLA FROM t2 WHERE COLB = 200 AND COLC ='C' LIMIT 1);
-DROP TABLE t1, t2;s
+DROP TABLE t1, t2;
+
+#
+# errors handling
+#
+
+create table t11 (a int NOT NULL, b int, primary key (a));
+create table t12 (a int NOT NULL, b int, primary key (a));
+create table t2 (a int NOT NULL, b int, primary key (a));
+insert into t11 values (0, 10),(1, 11),(2, 12);
+insert into t12 values (33, 10),(22, 11),(2, 12);
+insert into t2 values (1, 21),(2, 12),(3, 23);
+select * from t11;
+select * from t12;
+select * from t2;
+-- error 1241
+delete t11.*, t12.* from t11,t12 where t11.a = t12.a and t11.b > (select b from t2);
+select * from t2;
+drop table t11, t12, t2;

sql/sql_select.cc

@@ -5590,6 +5590,7 @@ sub_select(JOIN *join,JOIN_TAB *join_tab,bool end_of_records)
   int error;
   bool found=0;
   COND *on_expr=join_tab->on_expr, *select_cond=join_tab->select_cond;
+  my_bool *report_error= &(join->thd->net.report_error);
 
   if (!(error=(*join_tab->read_first_record)(join_tab)))
   {
@@ -5628,9 +5629,9 @@ sub_select(JOIN *join,JOIN_TAB *join_tab,bool end_of_records)
 	else
 	  info->file->unlock_row();
       }
-    } while (!(error=info->read_record(info)));
+    } while (!(error=info->read_record(info)) && !(*report_error));
   }
-  if (error > 0)				// Fatal error
+  if (error > 0 || (*report_error))				// Fatal error
     return -1;
 
   if (!found && on_expr)