bk commit into 5.0 tree (evgen:1.1992)

[eugene]

Below is the list of changes that have just been committed into a local
5.0 repository of evgen. When evgen does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1992 05/08/15 13:21:55 evgen@stripped +3 -0
  Merge epotemkin@stripped:/home/bk/mysql-5.0
  into moonbone.local:/work/mysql-5.0-bug-11864

  sql/sql_view.cc
    1.57 05/08/15 13:21:53 evgen@stripped +0 -0
    Auto merged

  sql/sql_derived.cc
    1.75 05/08/15 13:21:53 evgen@stripped +0 -0
    Auto merged

  mysql-test/r/derived.result
    1.55 05/08/15 13:21:53 evgen@stripped +0 -0
    Auto merged

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	evgen
# Host:	moonbone.local
# Root:	/work/mysql-5.0-bug-11864/RESYNC

--- 1.54/mysql-test/r/derived.result	2005-08-10 17:37:36 +04:00
+++ 1.55/mysql-test/r/derived.result	2005-08-15 13:21:53 +04:00
@@ -149,8 +149,8 @@
 (SELECT * FROM (SELECT 1 as a) as a )
 1
 select * from (select 1 as a) b  left join (select 2 as a) c using(a);
-a	a
-1	NULL
+a
+1
 SELECT * FROM (SELECT 1 UNION SELECT a) b;
 ERROR 42S22: Unknown column 'a' in 'field list'
 SELECT 1 as a FROM (SELECT a UNION SELECT 1) b;

--- 1.74/sql/sql_derived.cc	2005-08-08 01:21:25 +04:00
+++ 1.75/sql/sql_derived.cc	2005-08-15 13:21:53 +04:00
@@ -125,6 +125,11 @@
     if ((res= unit->prepare(thd, derived_result, 0, orig_table_list->alias)))
       goto exit;
 
+    if (check_duplicate_names(unit->types, 0))
+    {
+      res= -1;
+      goto exit;
+    }
 
     derived_result->tmp_table_param.init();
     derived_result->tmp_table_param.field_count= unit->types.elements;

--- 1.56/sql/sql_view.cc	2005-08-10 17:28:15 +04:00
+++ 1.57/sql/sql_view.cc	2005-08-15 13:21:53 +04:00
@@ -882,6 +882,9 @@
                                                          view_tables);
       lex->select_lex.context.outer_context= 0;
       lex->select_lex.context.select_lex= table->select_lex;
+      lex->select_lex.select_n_having_items+=
+        table->select_lex->select_n_having_items;
+
       /* do not check privileges & hide errors for view underlyings */
       for (SELECT_LEX *sl= lex->all_selects_list;
            sl;
@@ -902,7 +905,11 @@
 
       {
         if (view_tables->next_local)
+        {
           table->multitable_view= TRUE;
+          if (table->belong_to_view)
+           table->belong_to_view->multitable_view= TRUE;
+        }
         /* make nested join structure for view tables */
         NESTED_JOIN *nested_join;
         if (!(nested_join= table->nested_join=
@@ -1148,7 +1155,10 @@
     for (Field_translator *fld= trans; fld < end_of_trans; fld++)
     {
       if (!fld->item->fixed && fld->item->fix_fields(thd, &fld->item))
+      {
+        thd->set_query_id= save_set_query_id;        
         return TRUE;
+      }
     }
     thd->set_query_id= save_set_query_id;
   }