Bug#20593065 MULTI UPDATE RETURNS DIFFERENT DATA WITH ENGINE NDB

 - the UPDATE query is now optimized differently and the ORDER of the
   records from t is undefined(the ORDER BY is ignored)
 - disable the optimization in test like in so many other places
   and update the result files.

(cherry picked from commit 58def93a271e6ecd267c5362cd0ec934a83ab33f)

Author: blaudden

mysql-test/extra/rpl_tests/rpl_multi_update3.test

@@ -27,8 +27,14 @@ INSERT INTO t2 VALUES (NULL, 0), (NULL,1);
 SELECT * FROM t1 ORDER BY a;
 SELECT * FROM t2 ORDER BY a;
 
+
+SET @optimizer_switch_saved= @@optimizer_switch;
+SET @@optimizer_switch="derived_merge=off";
 --disable_warnings ONCE
 UPDATE t2, (SELECT a FROM t1 ORDER BY a) AS t SET t2.b = t.a+5 ;
+
+SET @@optimizer_switch=@optimizer_switch_saved;
+
 SELECT * FROM t1 ORDER BY a;
 SELECT * FROM t2 ORDER BY a;
 

mysql-test/suite/rpl/r/rpl_multi_update3.result

@@ -25,7 +25,10 @@ SELECT * FROM t2 ORDER BY a;
 a	b
 1	0
 2	1
+SET @optimizer_switch_saved= @@optimizer_switch;
+SET @@optimizer_switch="derived_merge=off";
 UPDATE t2, (SELECT a FROM t1 ORDER BY a) AS t SET t2.b = t.a+5 ;
+SET @@optimizer_switch=@optimizer_switch_saved;
 SELECT * FROM t1 ORDER BY a;
 a	b
 1	0

mysql-test/suite/rpl_ndb/r/rpl_ndb_multi_update3.result

@@ -24,7 +24,10 @@ SELECT * FROM t2 ORDER BY a;
 a	b
 1	0
 2	1
+SET @optimizer_switch_saved= @@optimizer_switch;
+SET @@optimizer_switch="derived_merge=off";
 UPDATE t2, (SELECT a FROM t1 ORDER BY a) AS t SET t2.b = t.a+5 ;
+SET @@optimizer_switch=@optimizer_switch_saved;
 SELECT * FROM t1 ORDER BY a;
 a	b
 1	0