From 841a2abde03cce4886b6a64f363e178d2d745887 Mon Sep 17 00:00:00 2001
From: "sergefp@mysql.com" <>
Date: Wed, 19 Oct 2005 12:41:30 +0400
Subject: Post-merge fixes

---
 sql/sql_delete.cc | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'sql/sql_delete.cc')

diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc
index 1690f96a3d4..83f50ba3ac5 100644
--- a/sql/sql_delete.cc
+++ b/sql/sql_delete.cc
@@ -147,7 +147,7 @@ bool mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds,
     {
       delete select;
       free_underlaid_joins(thd, &thd->lex->select_lex);
-      DBUG_RETURN(-1);			// This will force out message
+      DBUG_RETURN(TRUE);
     }
     
     if (!select && limit != HA_POS_ERROR)
@@ -166,7 +166,6 @@ bool mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds,
       {
         delete select;
         free_underlaid_joins(thd, &thd->lex->select_lex);
-        DBUG_RETURN(-1);			// This will force out message
       }
       /*
         Filesort has already found and selected the rows we want to delete,
@@ -175,7 +174,6 @@ bool mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds,
       delete select;
       free_underlaid_joins(thd, select_lex);
       select= 0;
-      DBUG_RETURN(TRUE);
     }
   }
 
-- 
cgit v1.2.1