Manual merge

mysql-test/r/ps.result:
  Manual merge.

2 files changed, 26 insertions, 16 deletions

diff --git a/mysql-test/r/ps.result b/mysql-test/r/ps.result
index a416ba5c482..036d50efbba 100644
--- a/mysql-test/r/ps.result
+++ b/mysql-test/r/ps.result
@@ -411,16 +411,26 @@ a	a
 2.1	2.2
 deallocate prepare stmt;
 create table t1 (a int);
-insert into t1 values (1),(2),(3);
-create table t2 select * from t1;
-PREPARE my_stmt FROM 'create table t2 select * from t1';
-drop table t2;
-execute my_stmt;
-drop table t2;
-execute my_stmt;
-execute my_stmt;
-ERROR 42S01: Table 't2' already exists
-drop table t2;
-execute my_stmt;
-drop table t1,t2;
-deallocate prepare my_stmt;
+insert into t1 (a) values (1), (2), (3), (4), (5), (6), (7), (8), (9), (10);
+prepare stmt from "select sql_calc_found_rows * from t1 limit 2";
+execute stmt;
+a
+1
+2
+select found_rows();
+found_rows()
+10
+execute stmt;
+a
+1
+2
+select found_rows();
+found_rows()
+10
+execute stmt;
+a
+1
+2
+select found_rows();
+found_rows()
+10
diff --git a/mysql-test/r/subselect.result b/mysql-test/r/subselect.result
index 8bcf7f9bff2..04c5f685f58 100644
--- a/mysql-test/r/subselect.result
+++ b/mysql-test/r/subselect.result
@@ -176,17 +176,17 @@ a	b
 a	b
 1	7
 2	7
-3	8
 4	8
+3	8
 explain extended (select * from t2 where t2.b=(select a from t3 order by 1 desc limit 1)) union (select * from t4 where t4.b=(select max(t2.a)*4 from t2) order by a);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	t2	ALL	NULL	NULL	NULL	NULL	2	Using where
 2	SUBQUERY	t3	ALL	NULL	NULL	NULL	NULL	3	Using filesort
-3	UNION	t4	ALL	NULL	NULL	NULL	NULL	3	Using where; Using filesort
+3	UNION	t4	ALL	NULL	NULL	NULL	NULL	3	Using where
 4	SUBQUERY	t2	ALL	NULL	NULL	NULL	NULL	2	
 NULL	UNION RESULT	<union1,3>	ALL	NULL	NULL	NULL	NULL	NULL	
 Warnings:
-Note	1003	(select test.t2.a AS `a`,test.t2.b AS `b` from test.t2 where (test.t2.b = (select test.t3.a AS `a` from test.t3 order by test.t3.a desc limit 1))) union (select test.t4.a AS `a`,test.t4.b AS `b` from test.t4 where (test.t4.b = (select (max(test.t2.a) * 4) AS `max(t2.a)*4` from test.t2)) order by test.t4.a)
+Note	1003	(select test.t2.a AS `a`,test.t2.b AS `b` from test.t2 where (test.t2.b = (select test.t3.a AS `a` from test.t3 order by test.t3.a desc limit 1))) union (select test.t4.a AS `a`,test.t4.b AS `b` from test.t4 where (test.t4.b = (select (max(test.t2.a) * 4) AS `max(t2.a)*4` from test.t2)) order by a)
 select (select a from t3 where a<t2.a*4 order by 1 desc limit 1), a from t2;
 (select a from t3 where a<t2.a*4 order by 1 desc limit 1)	a
 3	1