diff options
| author | unknown <hezx@hezx.(none)> | 2007-12-13 10:40:39 +0800 |
|---|---|---|
| committer | unknown <hezx@hezx.(none)> | 2007-12-13 10:40:39 +0800 |
| commit | d0b9496f8cea2e57c2c7cc4257d0147a36296a7c (patch) | |
| tree | 42f4e45830caec7e18fd15c1c575f93f74fc4b67 | |
| parent | 3fc4a67a1dbd6bfb67ccb771f589347abc7d5e2b (diff) | |
| download | mariadb-git-d0b9496f8cea2e57c2c7cc4257d0147a36296a7c.tar.gz | |
fix manual merge
| -rw-r--r-- | sql/sql_view.cc | 2 |
1 files changed, 0 insertions, 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. */ |