WL#2486 - natural and using join according to SQL:2003

* Provide backwards compatibility extension to name resolution of
  coalesced columns. The patch allows such columns to be qualified
  with a table (and db) name, as it is in 4.1.
  Based on a patch from Monty.

* Adjusted tests accordingly to test both backwards compatible name
  resolution of qualified columns, and ANSI-style resolution of
  non-qualified columns.
  For this, each affected test has two versions - one with qualified
  columns, and one without. 

1 files changed, 12 insertions, 12 deletions

diff --git a/mysql-test/r/ps_4heap.result b/mysql-test/r/ps_4heap.result
index 9b76003900a..8336a5bf99b 100644
--- a/mysql-test/r/ps_4heap.result
+++ b/mysql-test/r/ps_4heap.result
@@ -520,16 +520,16 @@ a	?	a
 drop table if exists t2 ;
 create table t2 as select * from t1 ;
 set @query1= 'SELECT * FROM t2 join t1 on (t1.a=t2.a) order by t2.a ' ;
-set @query2= 'SELECT * FROM t2 natural join t1 order by a ' ;
-set @query3= 'SELECT * FROM t2 join t1 using(a) order by a ' ;
+set @query2= 'SELECT * FROM t2 natural join t1 order by t2.a ' ;
+set @query3= 'SELECT * FROM t2 join t1 using(a) order by t2.a ' ;
 set @query4= 'SELECT * FROM t2 left join t1 on(t1.a=t2.a) order by t2.a ' ;
-set @query5= 'SELECT * FROM t2 natural left join t1 order by a ' ;
-set @query6= 'SELECT * FROM t2 left join t1 using(a) order by a ' ;
+set @query5= 'SELECT * FROM t2 natural left join t1 order by t2.a ' ;
+set @query6= 'SELECT * FROM t2 left join t1 using(a) order by t2.a ' ;
 set @query7= 'SELECT * FROM t2 right join t1 on(t1.a=t2.a) order by t2.a ' ;
-set @query8= 'SELECT * FROM t2 natural right join t1 order by a ' ;
-set @query9= 'SELECT * FROM t2 right join t1 using(a) order by a ' ;
+set @query8= 'SELECT * FROM t2 natural right join t1 order by t2.a ' ;
+set @query9= 'SELECT * FROM t2 right join t1 using(a) order by t2.a ' ;
 the join statement is:
-SELECT * FROM t2 right join t1 using(a) order by a 
+SELECT * FROM t2 right join t1 using(a) order by t2.a 
 prepare stmt1 from @query9  ;
 execute stmt1 ;
 a	b	b
@@ -550,7 +550,7 @@ a	b	b
 3	three	three
 4	four	four
 the join statement is:
-SELECT * FROM t2 natural right join t1 order by a 
+SELECT * FROM t2 natural right join t1 order by t2.a 
 prepare stmt1 from @query8 ;
 execute stmt1 ;
 a	b
@@ -592,7 +592,7 @@ a	b	a	b
 3	three	3	three
 4	four	4	four
 the join statement is:
-SELECT * FROM t2 left join t1 using(a) order by a 
+SELECT * FROM t2 left join t1 using(a) order by t2.a 
 prepare stmt1 from @query6 ;
 execute stmt1 ;
 a	b	b
@@ -613,7 +613,7 @@ a	b	b
 3	three	three
 4	four	four
 the join statement is:
-SELECT * FROM t2 natural left join t1 order by a 
+SELECT * FROM t2 natural left join t1 order by t2.a 
 prepare stmt1 from @query5 ;
 execute stmt1 ;
 a	b
@@ -655,7 +655,7 @@ a	b	a	b
 3	three	3	three
 4	four	4	four
 the join statement is:
-SELECT * FROM t2 join t1 using(a) order by a 
+SELECT * FROM t2 join t1 using(a) order by t2.a 
 prepare stmt1 from @query3 ;
 execute stmt1 ;
 a	b	b
@@ -676,7 +676,7 @@ a	b	b
 3	three	three
 4	four	four
 the join statement is:
-SELECT * FROM t2 natural join t1 order by a 
+SELECT * FROM t2 natural join t1 order by t2.a 
 prepare stmt1 from @query2 ;
 execute stmt1 ;
 a	b