bk commit into 5.1 tree (hezx:1.2654)

[hezx]

Below is the list of changes that have just been committed into a local
5.1 repository of hezx. When hezx 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@stripped, 2007-12-13 10:40:39+08:00, hezx@hezx.(none) +1 -0
  fix manual merge

  sql/sql_view.cc@stripped, 2007-12-13 10:40:31+08:00, hezx@hezx.(none) +0 -2
    fix manual merge

diff -Nrup a/sql/sql_view.cc b/sql/sql_view.cc
--- a/sql/sql_view.cc	2007-12-12 15:43:41 +08:00
+++ b/sql/sql_view.cc	2007-12-13 10:40:31 +08:00
@@ -1540,8 +1540,6 @@ bool mysql_drop_view(THD *thd, TABLE_LIS
   something_wrong= error || wrong_object_name || non_existant_views.length();
   if (some_views_deleted || !something_wrong)
   {
-    DBUG_RETURN(TRUE);
-  }
     /* if something goes wrong, bin-log with possible error code,
        otherwise bin-log with error code cleared.
      */