fixed bug in determinating uncacheable queries

new fatal_error interface to assign is_fatal_error and ne.report_error
commant about Item_row


mysql-test/r/subselect.result:
  test of inheritence of uncacheability
mysql-test/t/subselect.test:
  test of inheritence of uncacheability
sql/item.cc:
  new fatal_error interface to assign is_fatal_error and ne.report_error
sql/item_func.cc:
  new fatal_error interface to assign is_fatal_error and ne.report_error
sql/item_row.cc:
  comment about row
sql/item_subselect.cc:
  new fatal_error interface to assign is_fatal_error and ne.report_error
  (message should be sent by allocate routine
sql/log_event.cc:
  new fatal_error interface to assign is_fatal_error and ne.report_error
sql/mysqld.cc:
  new fatal_error interface to assign is_fatal_error and ne.report_error
sql/protocol.cc:
  new fatal_error interface to assign is_fatal_error and ne.report_error
sql/sql_base.cc:
  new fatal_error interface to assign is_fatal_error and ne.report_error
sql/sql_class.cc:
  new fatal_error interface to assign is_fatal_error and ne.report_error
sql/sql_class.h:
  new fatal_error interface to assign is_fatal_error and ne.report_error
sql/sql_delete.cc:
  new fatal_error interface to assign is_fatal_error and ne.report_error
sql/sql_insert.cc:
  new fatal_error interface to assign is_fatal_error and ne.report_error
sql/sql_lex.h:
  fixed bug in determinating uncacheable queries
sql/sql_parse.cc:
  new fatal_error interface to assign is_fatal_error and ne.report_error
sql/sql_prepare.cc:
  new fatal_error interface to assign is_fatal_error and ne.report_error
sql/sql_select.cc:
  new fatal_error interface to assign is_fatal_error and ne.report_error
sql/sql_show.cc:
  new fatal_error interface to assign is_fatal_error and ne.report_error
sql/sql_union.cc:
  new fatal_error interface to assign is_fatal_error and ne.report_error
sql/sql_update.cc:
  new fatal_error interface to assign is_fatal_error and ne.report_error
sql/thr_malloc.cc:
  new fatal_error interface to assign is_fatal_error and ne.report_error

1 files changed, 3 insertions, 9 deletions

diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc
index 989a0a6183a..e98572817ef 100644
--- a/sql/item_subselect.cc
+++ b/sql/item_subselect.cc
@@ -642,11 +642,8 @@ subselect_single_select_engine::subselect_single_select_engine(THD *thd,
     select_lex->options&= ~OPTION_FOUND_ROWS;
   join= new JOIN(thd, select_lex->item_list, select_lex->options, result);
   if (!join || !result)
-  {
     //out of memory
-    thd->fatal_error= 1;
-    my_message(ER_OUT_OF_RESOURCES, ER(ER_OUT_OF_RESOURCES), MYF(0));
-  } 
+    thd->fatal_error();
   unit->item= item;
   this->select_lex= select_lex;
 }
@@ -659,11 +656,8 @@ subselect_union_engine::subselect_union_engine(THD *thd,
 {
   unit= u;
   if (!result)
-  {
     //out of memory
-    thd->fatal_error= 1;
-    my_message(ER_OUT_OF_RESOURCES, ER(ER_OUT_OF_RESOURCES), MYF(0));
-  }
+    thd->fatal_error();
   unit->item= item;
 }
 
@@ -805,7 +799,7 @@ int subselect_single_select_engine::exec()
     join->thd->lex.current_select= save_select;
     executed= 1;
     join->thd->where= save_where;
-    DBUG_RETURN(join->error||thd->fatal_error);
+    DBUG_RETURN(join->error||thd->is_fatal_error);
   }
   join->thd->where= save_where;
   DBUG_RETURN(0);