Commit fa20bb5a authored Jan 20, 2008 by kaa@kaamos.(none)

Merge kaamos.(none):/data/src/opt/mysql-5.0-opt

into  kaamos.(none):/data/src/opt/mysql-5.1-opt

parents 6f451bf2 6619db58

mysql-test/r/subselect.result

+1 −1

Original line number	Diff line number	Diff line
		@@ -4338,7 +4338,7 @@ GROUP BY a4;
		a4 f3 a6
		1 NULL NULL
		2 NULL NULL
		DROP TABLE t1, t2;
		DROP TABLE t1, t2, t3, t4;
		End of 5.0 tests.
		CREATE TABLE t1 (a int, b int);
		INSERT INTO t1 VALUES (2,22),(1,11),(2,22);

mysql-test/t/subselect.test

+1 −1

Original line number	Diff line number	Diff line
		@@ -3211,7 +3211,7 @@ FROM
		t2, t3, t1 JOIN t2 a1 ON t1.f9 = a1.f4
		GROUP BY a4;

		DROP TABLE t1, t2;
		DROP TABLE t1, t2, t3, t4;

		--echo End of 5.0 tests.