database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge mhansson@bk-internal.mysql.com:/home/bk/mysql-5.0-opt

Browse Source 
into  dl145s.mysql.com:/dev/shm/mhansson/my50-bug28677
This commit is contained in:
mhansson@dl145s.mysql.com
2007-06-27 14:02:32 +02:00
parent 6a4b2343db cc2d534ab1
commit a90ff73738
5 changed files with 80 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/sql_select.cc
View File

@ -258,11 +258,8 @@ bool handle_select(THD *thd, LEX *lex, select_result *result,
thd->net.report_error));
res|= thd->net.report_error;
if (unlikely(res))
{
/* If we had a another error reported earlier then this will be ignored */
result->send_error(ER_UNKNOWN_ERROR, ER(ER_UNKNOWN_ERROR));
result->abort();
}
DBUG_RETURN(res);
}