Proper handling of ORDER BY table.column in UNION's

include/mysqld_error.h

@@ -264,4 +264,5 @@
 #define ER_ILLEGAL_REFERENCE 1245
 #define ER_DERIVED_MUST_HAVE_ALIAS 1246
 #define ER_SELECT_REDUCED 1247
-#define ER_ERROR_MESSAGES 248
+#define ER_TABLENAME_NOT_ALLOWED_HERE 1248
+#define ER_ERROR_MESSAGES 249

mysql-test/r/union.result

@@ -85,10 +85,7 @@ a	b
 2	b
 1	a
 (select a,b from t1 limit 2)  union all (select a,b from t2 order by a limit 1) order by t1.b;
-a	b
-1	a
-2	b
-3	c
+Table 't1' from one of SELECT's can not be used  in order clause
 explain (select a,b from t1 limit 2)  union all (select a,b from t2 order by a limit 1) order by b desc;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	4	

mysql-test/t/union.test

@@ -20,6 +20,7 @@ select 't1',b,count(*) from t1 group by b UNION select 't2',b,count(*) from t2 g
 (select a,b from t1 limit 2)  union all (select a,b from t2 order by a) limit 4;
 (select a,b from t1 limit 2)  union all (select a,b from t2 order by a limit 1);
 (select a,b from t1 limit 2)  union all (select a,b from t2 order by a limit 1) order by b desc;
+--error 1248
 (select a,b from t1 limit 2)  union all (select a,b from t2 order by a limit 1) order by t1.b;
 explain (select a,b from t1 limit 2)  union all (select a,b from t2 order by a limit 1) order by b desc;
 #(select sql_calc_found_rows  a,b from t1 limit 2)  union all (select a,b from t2 order by a) limit 2;

sql/item.cc

@@ -535,12 +535,10 @@ bool Item_field::fix_fields(THD *thd, TABLE_LIST *tables, Item **ref)
       SELECT_LEX *last= 0;
       
       Item **refer= (Item **)not_found_item;
-      SELECT_LEX *cursel=(SELECT_LEX *) thd->lex.current_select; 
       // Prevent using outer fields in subselects, that is not supported now
+      SELECT_LEX *cursel=(SELECT_LEX *) thd->lex.current_select;
       if (cursel->linkage != DERIVED_TABLE_TYPE)
-	for (SELECT_LEX *sl= (cursel->get_master()->order_list.elements) ?  
-	       cursel->select_lex() 
-	       : cursel->outer_select();
+	for (SELECT_LEX *sl=cursel->outer_select();
 	     sl;
 	     sl= sl->outer_select())
 	{
@@ -576,7 +574,7 @@ bool Item_field::fix_fields(THD *thd, TABLE_LIST *tables, Item **ref)
 	if (r->check_cols(1) || r->fix_fields(thd, tables, ref))
 	  return 1;
 	r->depended_from= last;
-	thd->lex.current_select->mark_as_dependent(last);
+	cursel->mark_as_dependent(last);
 	thd->add_possible_loop(r);
 	return 0;
       }

sql/share/czech/errmsg.txt

@@ -258,3 +258,4 @@ v/*
 "Reference '%-.64s' not supported (%s)",
 "Every derived table must have it's own alias"
 "Select %u was reduced during optimisation",
+"Table '%-.64s' from one of SELECT's can not be used  in %-.32s"

sql/share/danish/errmsg.txt

@@ -252,3 +252,4 @@
 "Reference '%-.64s' not supported (%s)",
 "Every derived table must have it's own alias"
 "Select %u was reduced during optimisation",
+"Table '%-.64s' from one of SELECT's can not be used  in %-.32s"

sql/share/dutch/errmsg.txt

@@ -260,3 +260,4 @@
 "Reference '%-.64s' not supported (%s)",
 "Every derived table must have it's own alias"
 "Select %u was reduced during optimisation",
+"Table '%-.64s' from one of SELECT's can not be used  in %-.32s"

sql/share/english/errmsg.txt

@@ -247,5 +247,6 @@
 "Cyclic reference on subqueries",
 "Converting column '%s' from %s to %s",
 "Reference '%-.64s' not supported (%s)",
-"Every derived table must have it's own alias"
+"Every derived table must have it's own alias",
 "Select %u was reduced during optimisation",
+"Table '%-.64s' from one of SELECT's can not be used  in %-.32s"

sql/share/estonian/errmsg.txt

@@ -254,3 +254,4 @@
 "Reference '%-.64s' not supported (%s)",
 "Every derived table must have it's own alias"
 "Select %u was reduced during optimisation",
+"Table '%-.64s' from one of SELECT's can not be used  in %-.32s"

sql/share/french/errmsg.txt

@@ -249,3 +249,4 @@
 "Reference '%-.64s' not supported (%s)",
 "Every derived table must have it's own alias"
 "Select %u was reduced during optimisation",
+"Table '%-.64s' from one of SELECT's can not be used  in %-.32s"

sql/share/german/errmsg.txt

@@ -252,3 +252,4 @@
 "Reference '%-.64s' not supported (%s)",
 "Every derived table must have it's own alias"
 "Select %u was reduced during optimisation",
+"Table '%-.64s' from one of SELECT's can not be used  in %-.32s"

sql/share/greek/errmsg.txt

@@ -249,3 +249,4 @@
 "Reference '%-.64s' not supported (%s)",
 "Every derived table must have it's own alias"
 "Select %u was reduced during optimisation",
+"Table '%-.64s' from one of SELECT's can not be used  in %-.32s"

sql/share/hungarian/errmsg.txt

@@ -251,3 +251,4 @@
 "Reference '%-.64s' not supported (%s)",
 "Every derived table must have it's own alias"
 "Select %u was reduced during optimisation",
+"Table '%-.64s' from one of SELECT's can not be used  in %-.32s"

sql/share/italian/errmsg.txt

@@ -249,3 +249,4 @@
 "Reference '%-.64s' not supported (%s)",
 "Every derived table must have it's own alias"
 "Select %u was reduced during optimisation",
+"Table '%-.64s' from one of SELECT's can not be used  in %-.32s"

sql/share/japanese/errmsg.txt

@@ -251,3 +251,4 @@
 "Reference '%-.64s' not supported (%s)",
 "Every derived table must have it's own alias"
 "Select %u was reduced during optimisation",
+"Table '%-.64s' from one of SELECT's can not be used  in %-.32s"

sql/share/korean/errmsg.txt

@@ -249,3 +249,4 @@
 "Reference '%-.64s' not supported (%s)",
 "Every derived table must have it's own alias"
 "Select %u was reduced during optimisation",
+"Table '%-.64s' from one of SELECT's can not be used  in %-.32s"

sql/share/norwegian-ny/errmsg.txt

@@ -251,3 +251,4 @@
 "Reference '%-.64s' not supported (%s)",
 "Every derived table must have it's own alias"
 "Select %u was reduced during optimisation",
+"Table '%-.64s' from one of SELECT's can not be used  in %-.32s"

sql/share/norwegian/errmsg.txt

@@ -251,3 +251,4 @@
 "Reference '%-.64s' not supported (%s)",
 "Every derived table must have it's own alias"
 "Select %u was reduced during optimisation",
+"Table '%-.64s' from one of SELECT's can not be used  in %-.32s"

sql/share/polish/errmsg.txt

@@ -253,3 +253,4 @@
 "Reference '%-.64s' not supported (%s)",
 "Every derived table must have it's own alias"
 "Select %u was reduced during optimisation",
+"Table '%-.64s' from one of SELECT's can not be used  in %-.32s"

sql/share/portuguese/errmsg.txt

@@ -249,3 +249,4 @@
 "Reference '%-.64s' not supported (%s)",
 "Every derived table must have it's own alias"
 "Select %u was reduced during optimisation",
+"Table '%-.64s' from one of SELECT's can not be used  in %-.32s"

sql/share/romanian/errmsg.txt

@@ -253,3 +253,4 @@
 "Reference '%-.64s' not supported (%s)",
 "Every derived table must have it's own alias"
 "Select %u was reduced during optimisation",
+"Table '%-.64s' from one of SELECT's can not be used  in %-.32s"

sql/share/russian/errmsg.txt

@@ -252,3 +252,4 @@
 " '%-.64s'   (%s)",
 "Every derived table must have it's own alias"
 "Select %u     ",
+"Table '%-.64s' from one of SELECT's can not be used  in %-.32s"

sql/share/serbian/errmsg.txt

@@ -245,3 +245,4 @@
 "Reference '%-.64s' not supported (%s)",
 "Every derived table must have it's own alias"
 "Select %u was reduced during optimisation",
+"Table '%-.64s' from one of SELECT's can not be used  in %-.32s"

sql/share/slovak/errmsg.txt

@@ -257,3 +257,4 @@
 "Reference '%-.64s' not supported (%s)",
 "Every derived table must have it's own alias"
 "Select %u was reduced during optimisation",
+"Table '%-.64s' from one of SELECT's can not be used  in %-.32s"

sql/share/spanish/errmsg.txt

@@ -250,3 +250,4 @@
 "Reference '%-.64s' not supported (%s)",
 "Every derived table must have it's own alias"
 "Select %u was reduced during optimisation",
+"Table '%-.64s' from one of SELECT's can not be used  in %-.32s"

sql/share/swedish/errmsg.txt

@@ -249,3 +249,4 @@
 "Reference '%-.64s' not supported (%s)",
 "Every derived table must have it's own alias"
 "Select %u was reduced during optimisation",
+"Table '%-.64s' from one of SELECT's can not be used  in %-.32s"

sql/share/ukrainian/errmsg.txt

@@ -254,3 +254,4 @@
 " '%-.64s'  i (%s)",
 "Every derived table must have it's own alias"
 "Select %u was   iii",
+"Table '%-.64s' from one of SELECT's can not be used  in %-.32s"

sql/sql_base.cc

@@ -1957,8 +1957,14 @@ find_field_in_tables(THD *thd, Item_ident *item, TABLE_LIST *tables,
 	table_name=buff;
       }
       if (report_error)
-	my_printf_error(ER_UNKNOWN_TABLE, ER(ER_UNKNOWN_TABLE), MYF(0),
-			table_name, thd->where);
+      {
+	if (thd->lex.current_select->get_master()->order_list.elements)
+	  my_printf_error(ER_TABLENAME_NOT_ALLOWED_HERE, ER(ER_TABLENAME_NOT_ALLOWED_HERE), 
+			  MYF(0), table_name, thd->where);
+	else
+	  my_printf_error(ER_UNKNOWN_TABLE, ER(ER_UNKNOWN_TABLE), MYF(0),
+			  table_name, thd->where);
+      }
       else
 	return (Field*) not_found_field;
     }