merging

include/mysql_com.h:
  Auto merged
include/mysqld_error.h:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/share/czech/errmsg.txt:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/share/danish/errmsg.txt:
  Auto merged
sql/share/dutch/errmsg.txt:
  Auto merged
sql/share/english/errmsg.txt:
  Auto merged
sql/share/estonian/errmsg.txt:
  Auto merged
sql/share/french/errmsg.txt:
  Auto merged
sql/share/german/errmsg.txt:
  Auto merged
sql/share/greek/errmsg.txt:
  Auto merged
sql/share/hungarian/errmsg.txt:
  Auto merged
sql/share/italian/errmsg.txt:
  Auto merged
sql/share/japanese/errmsg.txt:
  Auto merged
sql/share/korean/errmsg.txt:
  Auto merged
sql/share/norwegian-ny/errmsg.txt:
  Auto merged
sql/share/norwegian/errmsg.txt:
  Auto merged
sql/share/polish/errmsg.txt:
  Auto merged
sql/share/portuguese/errmsg.txt:
  Auto merged
sql/share/romanian/errmsg.txt:
  Auto merged
sql/share/russian/errmsg.txt:
  Auto merged
sql/share/serbian/errmsg.txt:
  Auto merged
sql/share/slovak/errmsg.txt:
  Auto merged
sql/share/spanish/errmsg.txt:
  Auto merged

1 files changed, 2 insertions, 2 deletions

diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index 8aa33a65ce3..ba86b524401 100644
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -2110,7 +2110,7 @@ int setup_fields(THD *thd, TABLE_LIST *tables, List<Item> &fields,
       thd->used_tables|=item->used_tables();
     }
   }
-  DBUG_RETURN(test(thd->fatal_error));
+  DBUG_RETURN(test(thd->fatal_error || thd->net.report_error));
 }
 
 
@@ -2324,7 +2324,7 @@ int setup_conds(THD *thd,TABLE_LIST *tables,COND **conds)
 	table->on_expr=and_conds(table->on_expr,cond_and);
     }
   }
-  DBUG_RETURN(test(thd->fatal_error));
+  DBUG_RETURN(test(thd->fatal_error || thd->net.report_error));
 }