diff options
| author | konstantin@mysql.com <> | 2004-08-24 23:07:08 +0400 |
|---|---|---|
| committer | konstantin@mysql.com <> | 2004-08-24 23:07:08 +0400 |
| commit | 522a27069f555cc2332c753560a7119c623d6639 (patch) | |
| tree | 27afa0ffb4411fa21754ed6f1be2820f7eb7784f /sql/sql_select.cc | |
| parent | 06affe9b5bde6922bc0a2141df9d4f704f8c437c (diff) | |
| parent | ae18dc3ec82e607f041878c4760ba7526999ae86 (diff) | |
| download | mariadb-git-522a27069f555cc2332c753560a7119c623d6639.tar.gz | |
Merge: manual resolve
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 630a520066a..6fdc1c2bfc3 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); } |