diff options
| author | sergefp@mysql.com <> | 2005-10-19 12:41:30 +0400 |
|---|---|---|
| committer | sergefp@mysql.com <> | 2005-10-19 12:41:30 +0400 |
| commit | 841a2abde03cce4886b6a64f363e178d2d745887 (patch) | |
| tree | 78335682bf1cbbc0ed6e5f601e65d8944748366a /sql/sql_delete.cc | |
| parent | e7065d355c7360aaa15ae168499506100c91402d (diff) | |
| download | mariadb-git-841a2abde03cce4886b6a64f363e178d2d745887.tar.gz | |
Post-merge fixes
Diffstat (limited to 'sql/sql_delete.cc')
| -rw-r--r-- | sql/sql_delete.cc | 4 |
1 files changed, 1 insertions, 3 deletions
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); } } |