← Back to team overview

maria-developers team mailing list archive

Rev 2778: Merge in file:///home/psergey/dev/maria-5.3-subqueries-r7-rel/

 

At file:///home/psergey/dev/maria-5.3-subqueries-r7-rel/

------------------------------------------------------------
revno: 2778 [merge]
revision-id: psergey@xxxxxxxxxxxx-20100315063535-jsp4jgya6lfqt8e6
parent: psergey@xxxxxxxxxxxx-20100315063254-z1ctm7srl0573s5c
parent: psergey@xxxxxxxxxxxx-20100315060659-0spqc4jdav12ja2u
committer: Sergey Petrunya <psergey@xxxxxxxxxxxx>
branch nick: maria-5.3-subqueries-r7-rel
timestamp: Mon 2010-03-15 09:35:35 +0300
message:
  Merge
modified:
  mysql-test/r/type_datetime.result sp1f-type_datetime.result-20001228015634-jrgwqpilnfn4kvdp6wm5hp5imvf3tkek
=== modified file 'mysql-test/r/type_datetime.result'
--- a/mysql-test/r/type_datetime.result	2010-02-11 21:59:32 +0000
+++ b/mysql-test/r/type_datetime.result	2010-03-15 06:06:59 +0000
@@ -516,7 +516,7 @@
 1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading const tables
 Warnings:
 Note	1276	Field or reference 'test.t1.cur_date' of SELECT #2 was resolved in SELECT #1
-Note	1003	select '1' AS `id`,'2007-04-25 18:30:22' AS `cur_date` from `test`.`t1` `x1` join `test`.`t1` where (('2007-04-25 18:30:22' = 0))
+Note	1003	select '1' AS `id`,'2007-04-25 18:30:22' AS `cur_date` from `test`.`t1` semi join (`test`.`t1` `x1`) where (('2007-04-25 18:30:22' = 0))
 select * from t1
 where id in (select id from t1 as x1 where (t1.cur_date is null));
 id	cur_date
@@ -527,7 +527,7 @@
 1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading const tables
 Warnings:
 Note	1276	Field or reference 'test.t2.cur_date' of SELECT #2 was resolved in SELECT #1
-Note	1003	select '1' AS `id`,'2007-04-25' AS `cur_date` from `test`.`t2` `x1` join `test`.`t2` where (('2007-04-25' = 0))
+Note	1003	select '1' AS `id`,'2007-04-25' AS `cur_date` from `test`.`t2` semi join (`test`.`t2` `x1`) where (('2007-04-25' = 0))
 select * from t2
 where id in (select id from t2 as x1 where (t2.cur_date is null));
 id	cur_date