Unify a test with the 10.3 version

Remove trailing white space, and use lower case for "eval" and "let".
Add an "End of 10.2 tests" marker to ease future merges.

mysql-test/r/derived_cond_pushdown.result

@@ -10387,3 +10387,4 @@ f
 3
 DROP VIEW v1;
 DROP TABLE t1;
+# End of 10.2 tests

mysql-test/t/derived_cond_pushdown.test

@@ -1602,7 +1602,7 @@ CREATE TABLE t2 (x INT, y INT, z INT);
 INSERT INTO t1 VALUES (1,1,66,1), (1,1,56,2), (3,2,42,3);
 INSERT INTO t2 VALUES (1,1,66), (1,12,32);
 
-LET $query=
+let $query=
 SELECT *
 FROM t2,
 (
@@ -1613,11 +1613,11 @@ FROM t2,
 ) AS v1
 WHERE (v1.a=1) AND (v1.b=v1.a) AND
       (v1.a=t2.x) AND (v1.max_c>30);
-EVAL $query;
-EVAL EXPLAIN $query;
-EVAL EXPLAIN FORMAT=JSON $query;
+eval $query;
+eval EXPLAIN $query;
+eval EXPLAIN FORMAT=JSON $query;
 
-LET $query=
+let $query=
 SELECT *
 FROM t2,
 (
@@ -1628,9 +1628,9 @@ FROM t2,
 ) AS v1
 WHERE (v1.a=1) AND (v1.b=v1.a) AND (v1.b=v1.d) AND
       (v1.a=t2.x) AND (v1.max_c>30);
-EVAL $query;
-EVAL EXPLAIN $query;
-EVAL EXPLAIN FORMAT=JSON $query;
+eval $query;
+eval EXPLAIN $query;
+eval EXPLAIN FORMAT=JSON $query;
 
 DROP TABLE t1,t2;
 
@@ -1656,7 +1656,7 @@ CREATE TABLE t2 (e INT, f INT, g INT);
 INSERT INTO t1 VALUES (1,14),(2,13),(1,19),(2,32),(3,24);
 INSERT INTO t2 VALUES (1,19,2),(3,24,1),(1,12,2),(3,11,3),(2,32,1);
 
-LET $query=
+let $query=
 SELECT * FROM t1
 WHERE (t1.a,t1.b) IN
   (
@@ -1670,11 +1670,11 @@ WHERE (t1.a,t1.b) IN
     WHERE d_tab.e>1
   )
 ;
-EVAL $query;
-EVAL EXPLAIN $query;
-EVAL EXPLAIN FORMAT=JSON $query;
+eval $query;
+eval EXPLAIN $query;
+eval EXPLAIN FORMAT=JSON $query;
 
-LET $query=
+let $query=
 SELECT * FROM t1
 WHERE (t1.a,t1.b) IN
   (
@@ -1688,11 +1688,11 @@ WHERE (t1.a,t1.b) IN
     WHERE d_tab.max_f<25
   )
 ;
-EVAL $query;
-EVAL EXPLAIN $query;
-EVAL EXPLAIN FORMAT=JSON $query;
+eval $query;
+eval EXPLAIN $query;
+eval EXPLAIN FORMAT=JSON $query;
 
-LET $query=
+let $query=
 SELECT * FROM t1
 WHERE (t1.a,t1.b) IN
   (
@@ -1706,11 +1706,11 @@ WHERE (t1.a,t1.b) IN
     GROUP BY d_tab.g
   )
 ;
-EVAL $query;
-EVAL EXPLAIN $query;
-EVAL EXPLAIN FORMAT=JSON $query;
+eval $query;
+eval EXPLAIN $query;
+eval EXPLAIN FORMAT=JSON $query;
 
-LET $query=
+let $query=
 SELECT * FROM t1
 WHERE (t1.a,t1.b) IN
   (
@@ -1724,9 +1724,9 @@ WHERE (t1.a,t1.b) IN
     GROUP BY d_tab.g
   )
 ;
-EVAL $query;
-EVAL EXPLAIN $query;
-EVAL EXPLAIN FORMAT=JSON $query;
+eval $query;
+eval EXPLAIN $query;
+eval EXPLAIN FORMAT=JSON $query;
 
 DROP TABLE t1,t2;
 
@@ -1755,7 +1755,7 @@ CREATE TABLE t1 (a INT, b INT);
 
 INSERT INTO t1 VALUES (1,2),(2,3),(3,4);
 
-LET $query=
+let $query=
 SELECT * FROM
 (
   SELECT t1.b AS a
@@ -1763,10 +1763,10 @@ SELECT * FROM
   GROUP BY t1.a
 ) dt
 WHERE (dt.a=2);
-EVAL $query;
-EVAL EXPLAIN FORMAT=JSON $query;
+eval $query;
+eval EXPLAIN FORMAT=JSON $query;
 
-LET $query=
+let $query=
 SELECT * FROM
 (
   SELECT t1.b AS a
@@ -1775,10 +1775,10 @@ SELECT * FROM
   HAVING (t1.a<3)
 ) dt
 WHERE (dt.a>1);
-EVAL $query;
-EVAL EXPLAIN FORMAT=JSON $query;
+eval $query;
+eval EXPLAIN FORMAT=JSON $query;
 
-LET $query=
+let $query=
 SELECT * FROM
 (
   SELECT 'ab' AS a
@@ -1786,10 +1786,10 @@ SELECT * FROM
   GROUP BY t1.a
 ) dt
 WHERE (dt.a='ab');
-EVAL $query;
-EVAL EXPLAIN FORMAT=JSON $query;
+eval $query;
+eval EXPLAIN FORMAT=JSON $query;
 
-LET $query=
+let $query=
 SELECT * FROM
 (
   SELECT 1 AS a
@@ -1797,8 +1797,8 @@ SELECT * FROM
   GROUP BY t1.a
 ) dt
 WHERE (dt.a=1);
-EVAL $query;
-EVAL EXPLAIN FORMAT=JSON $query;
+eval $query;
+eval EXPLAIN FORMAT=JSON $query;
 
 DROP TABLE t1;
 
@@ -1810,7 +1810,7 @@ DROP TABLE t1;
 CREATE TABLE t1 (a INT, b INT);
 INSERT INTO t1 VALUES (1,2),(1,3);
 
-LET $query=
+let $query=
 SELECT * FROM
 (
   SELECT t1.a
@@ -1825,10 +1825,10 @@ JOIN
   WHERE 1 IN (0,t1.a)
 ) AS dt2
 ON dt1.a = dt2.a;
-EVAL $query;
-EVAL EXPLAIN FORMAT=JSON $query;
+eval $query;
+eval EXPLAIN FORMAT=JSON $query;
 
-LET $query=
+let $query=
 SELECT * FROM
 (
   SELECT t1.a,MAX(t1.b)
@@ -1836,9 +1836,8 @@ SELECT * FROM
   GROUP BY t1.a
 ) AS dt, t1
 WHERE dt.a=t1.a AND dt.a IN (1,t1.a);
-EVAL $query;
-EVAL EXPLAIN FORMAT=JSON $query;
-
+eval $query;
+eval EXPLAIN FORMAT=JSON $query;
 DROP TABLE t1;
 
 --echo #
@@ -2075,3 +2074,5 @@ SELECT * FROM t1;
 
 DROP VIEW v1;
 DROP TABLE t1;
+
+--echo # End of 10.2 tests