1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

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


mysql-test/r/subselect.result:
  Manual merge.
mysql-test/t/subselect.test:
  Manual merge.
This commit is contained in:
unknown 2008-01-20 13:50:26 +03:00
commit 8f081d6fa2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/r/subselect.result
View File

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

2
mysql-test/t/subselect.test
View File

@ -3211,7 +3211,7 @@ FROM
t2, t3, t1 JOIN t2 a1 ON t1.f9 = a1.f4 t2, t3, t1 JOIN t2 a1 ON t1.f9 = a1.f4
GROUP BY a4; GROUP BY a4;
DROP TABLE t1, t2; DROP TABLE t1, t2, t3, t4;
--echo End of 5.0 tests. --echo End of 5.0 tests.