Commit d0b9496f authored by unknown's avatar unknown

fix manual merge

parent 3fc4a67a
...@@ -1540,8 +1540,6 @@ bool mysql_drop_view(THD *thd, TABLE_LIST *views, enum_drop_mode drop_mode) ...@@ -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(); something_wrong= error || wrong_object_name || non_existant_views.length();
if (some_views_deleted || !something_wrong) if (some_views_deleted || !something_wrong)
{ {
DBUG_RETURN(TRUE);
}
/* if something goes wrong, bin-log with possible error code, /* if something goes wrong, bin-log with possible error code,
otherwise bin-log with error code cleared. otherwise bin-log with error code cleared.
*/ */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment