database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Merge linux-st28.site:/home/martin/mysql/src/bug28677/my50-bug28677

Browse Source 
into  linux-st28.site:/home/martin/mysql/src/bug28677/my51-bug28677


sql/sql_class.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_insert.cc:
  C
  c
This commit is contained in:
unknown
2007-06-18 17:22:21 +03:00
parent 023f3dd0df 3d31e3d641
commit 0578f74575
4 changed files with 29 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/sql_select.cc
View File

@@ -261,11 +261,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);
}