mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
fix manual merge
This commit is contained in:
@ -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.
|
||||||
*/
|
*/
|
||||||
|
Reference in New Issue
Block a user