Commit ef8606b3 authored by hezx@hezx.(none)'s avatar hezx@hezx.(none)
Browse files

fix manual merge

parent 81f04074

sql/sql_view.cc

+0 −2
Original line number Diff line number Diff line
@@ -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.

     */