From d0b9496f8cea2e57c2c7cc4257d0147a36296a7c Mon Sep 17 00:00:00 2001
From: unknown <hezx@hezx.(none)>
Date: Thu, 13 Dec 2007 10:40:39 +0800
Subject: [PATCH] fix manual merge

---
 sql/sql_view.cc | 2 --
 1 file changed, 2 deletions(-)

diff --git a/sql/sql_view.cc b/sql/sql_view.cc
index 41c0aff0cd1..362bab2d700 100644
--- a/sql/sql_view.cc
+++ b/sql/sql_view.cc
@@ -1540,8 +1540,6 @@ bool mysql_drop_view(THD *thd, TABLE_LIST *views, enum_drop_mode drop_mode)
   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.
      */