bk commit into 5.0 tree (timour:1.2010)

[timour]

Below is the list of changes that have just been committed into a local
5.0 repository of timka. When timka 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.2010 05/10/03 22:02:22 timour@stripped +3 -0
  Merge mysql.com:/home/timka/mysql/src/5.0-virgin
  into  mysql.com:/home/timka/mysql/src/5.0-bug-13410

  sql/table.cc
    1.194 05/10/03 22:02:18 timour@stripped +0 -0
    Auto merged

  sql/sql_base.cc
    1.308 05/10/03 22:02:18 timour@stripped +0 -0
    Auto merged

  sql/item.h
    1.171 05/10/03 22:02:18 timour@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:	timour
# Host:	lamia.home
# Root:	/home/timka/mysql/src/5.0-bug-13410/RESYNC

--- 1.170/sql/item.h	2005-09-30 12:36:13 +03:00
+++ 1.171/sql/item.h	2005-10-03 22:02:18 +03:00
@@ -1622,7 +1622,7 @@
   }
   Item *real_item()
   {
-    return (*ref)->real_item();
+    return (ref && *ref) ? (*ref)->real_item() : this;
   }
   bool walk(Item_processor processor, byte *arg)
   { return (*ref)->walk(processor, arg); }

--- 1.307/sql/sql_base.cc	2005-09-30 12:36:13 +03:00
+++ 1.308/sql/sql_base.cc	2005-10-03 22:02:18 +03:00
@@ -3353,9 +3353,9 @@
 
   for (uint i= 0; (item=li++); i++)
   {
-    if (field_name && item->type() == Item::FIELD_ITEM)
+    if (field_name && item->real_item()->type() == Item::FIELD_ITEM)
     {
-      Item_field *item_field= (Item_field*) item;
+      Item_ident *item_field= (Item_ident*) item;
 
       /*
 	In case of group_concat() with ORDER BY condition in the QUERY

--- 1.193/sql/table.cc	2005-09-30 10:39:14 +03:00
+++ 1.194/sql/table.cc	2005-10-03 22:02:18 +03:00
@@ -2426,22 +2426,6 @@
 const char *Natural_join_column::table_name()
 {
   return table_ref->alias;
-  /*
-    TODO:
-    I think that it is sufficient to return just
-    table->alias, which is correctly set to either
-    the view name, the table name, or the alias to
-    the table reference (view or stored table).
-  */
-#ifdef NOT_YET
-  if (view_field)
-    return table_ref->view_name.str;
-
-  DBUG_ASSERT(!strcmp(table_ref->table_name,
-                      table_ref->table->s->table_name));
-  return table_ref->table_name;
-}
-#endif
 }
 
 
@@ -2577,7 +2561,7 @@
     DBUG_RETURN(field);
   }
   Item *item= new Item_direct_view_ref(&view->view->select_lex.context,
-                                       field_ref, view->view_name.str,
+                                       field_ref, view->alias,
                                        name);
   DBUG_RETURN(item);
 }