summaryrefslogtreecommitdiff
path: root/sql/sql_select.cc
diff options
context:
space:
mode:
Diffstat (limited to 'sql/sql_select.cc')
-rw-r--r--sql/sql_select.cc10
1 files changed, 2 insertions, 8 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index fdea963b3ca..34ee7139d71 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -199,16 +199,10 @@ int handle_select(THD *thd, LEX *lex, select_result *result)
res= 1;
if (res)
{
- if (result)
- {
- result->send_error(0, NullS);
- result->abort();
- }
- else
- send_error(thd, 0, NullS);
+ result->send_error(0, NullS);
+ result->abort();
res= 1; // Error sent to client
}
- delete result;
DBUG_RETURN(res);
}