Commit fda6adec authored by unknown's avatar unknown
Browse files

Update test results 

Fix merge problem


mysql-test/r/join_outer_innodb.result:
  Update test result
mysql-test/t/group_min_max.test:
  Add missing drop table (lost during merge)
parent 8b909a27

mysql-test/r/join_outer_innodb.result

+2 −2
Original line number Diff line number Diff line
@@ -14,6 +14,6 @@ EXPLAIN 
SELECT COUNT(*) FROM t2 LEFT JOIN t1 ON t2.fkey = t1.id 

WHERE t1.name LIKE 'A%' OR FALSE;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	index	PRIMARY,name	name	23	NULL	3	Using where; Using index

1	SIMPLE	t2	ref	fkey	fkey	5	test.t1.id	1	Using where; Using index

1	SIMPLE	t2	index	NULL	fkey	5	NULL	5	Using index

1	SIMPLE	t1	eq_ref	PRIMARY	PRIMARY	4	test.t2.fkey	1	Using where

DROP TABLE t1,t2;

mysql-test/t/group_min_max.test

+2 −0
Original line number Diff line number Diff line
@@ -683,6 +683,8 @@ select distinct a1 from t1 where a2 = 'b'; 
# Test case moved to group_min_max_innodb





drop table t1,t2,t3;



#

# Bug #14920 Ordering aggregated result sets with composite primary keys

# corrupts resultset