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, 5 insertions, 11 deletions

diff --git a/mysql-test/t/null_key.test b/mysql-test/t/null_key.test
index 4ab99fc5d6d..e15aec01d2a 100644
--- a/mysql-test/t/null_key.test
+++ b/mysql-test/t/null_key.test
@@ -152,18 +152,12 @@ INSERT INTO t1 (order_id, product_id, product_type) VALUES
 INSERT INTO t2 (order_id, product_id, product_type) VALUES
 ('9d9aad7764b5b2c53004348ef8d34500',2315652, 3);
 
-select t1.* from t1 left join t2
-       on (t1.order_id = t2.order_id and
-           t1.product_id = t2.product_id and
-           t1.product_type = t2.product_type)
-where t2.order_id = NULL;
-
-select t1.* from t1 left join t2
-       on (t1.order_id = t2.order_id and
-           t1.product_id = t2.product_id and
-           t1.product_type = t2.product_type)
+select t1.* from t1
+left join t2 using(order_id, product_id, product_type)
+where t2.order_id=NULL;
+select t1.* from t1
+left join t2 using(order_id, product_id, product_type)
 where t2.order_id is NULL;
-
 drop table t1,t2;
 
 #