fix manual merge

ef8606b3 · hezx@hezx.(none) · 81f04074 · ef8606b3
Commit ef8606b3 authored Dec 13, 2007 by hezx@hezx.(none)
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 2 deletions

sql/sql_view.cc sql/sql_view.cc +0 -2

No files found.
--- 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.
     */