bk commit into 5.2 tree (msvensson:1.2167)

[msvensson]

Below is the list of changes that have just been committed into a local
5.2 repository of msvensson. When msvensson 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.2167 06/02/24 14:54:41 msvensson@neptunus.(none) +2 -0
  Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1
  into  neptunus.(none):/home/msvensson/mysql/mysql-5.2

  sql/share/errmsg.txt
    1.84 06/02/24 14:54:34 msvensson@neptunus.(none) +0 -0
    Auto merged

  sql/item.cc
    1.170 06/02/24 14:54:34 msvensson@neptunus.(none) +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:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/mysql-5.2/RESYNC

--- 1.169/sql/item.cc	2006-02-22 00:45:34 +01:00
+++ 1.170/sql/item.cc	2006-02-24 14:54:34 +01:00
@@ -5151,9 +5151,9 @@
     if (item_ref->ref_type() == VIEW_REF)
     {
       Item *item_ref_ref= *(item_ref->ref);
-      DBUG_ASSERT((*ref)->type() == FIELD_ITEM &&
-                  (item_ref_ref->type() == FIELD_ITEM));
-      return (*ref == item_ref_ref);
+      DBUG_ASSERT((*ref)->real_item()->type() == FIELD_ITEM &&
+                  (item_ref_ref->real_item()->type() == FIELD_ITEM));
+      return ((*ref)->real_item() == item_ref_ref->real_item());
     }
   }
   return FALSE;

--- 1.83/sql/share/errmsg.txt	2006-02-24 10:08:48 +01:00
+++ 1.84/sql/share/errmsg.txt	2006-02-24 14:54:34 +01:00
@@ -5813,7 +5813,5 @@
 ER_WARN_DEPRECATED_STATEMENT
         eng  "The '%s' statement is deprecated and will be removed in MySQL %s. Please
use client programs (e.g. %s) instead."
 
-ER_TABLE_NEEDS_UPGRADE
-         eng "Table upgrade required. Please do \"REPAIR TABLE `%-.32s`\" to fix it!"
 ER_SP_NO_AGGREGATE 42000
 	eng "AGGREGATE is not supported for stored functions"