Don't print warnings about 'setrlimit' if --warnings is not given

Code review/cleanup of sub subselect_uniquesubquery_engine


sql/ha_myisam.cc:
  Removed unnecessary casts
sql/item_subselect.cc:
  Safety fix (reset engine)
  Code review/cleanup of sub subselect_uniquesubquery_engine
  Remove 'end_exec'. (Should be done on query end, not in the middle)
sql/item_subselect.h:
  Removed end_exec();
sql/mysqld.cc:
  Don't print warnings about 'setrlimit' if --warnings is not given

1 files changed, 8 insertions, 3 deletions

diff --git a/sql/item_subselect.h b/sql/item_subselect.h
index a17715c57c1..dc4ac8435f4 100644
--- a/sql/item_subselect.h
+++ b/sql/item_subselect.h
@@ -230,6 +230,7 @@ public:
   friend class subselect_indexsubquery_engine;
 };
 
+
 /* ALL/ANY/SOME subselect */
 class Item_allany_subselect :public Item_in_subselect
 {
@@ -244,6 +245,7 @@ public:
   trans_res select_transformer(JOIN *join);
 };
 
+
 class subselect_engine: public Sql_alloc
 {
 protected:
@@ -275,6 +277,7 @@ public:
   bool may_be_null() { return maybe_null; };
 };
 
+
 class subselect_single_select_engine: public subselect_engine
 {
   my_bool prepared; /* simple subselect is prepared */
@@ -295,6 +298,7 @@ public:
   void exclude();
 };
 
+
 class subselect_union_engine: public subselect_engine
 {
   st_select_lex_unit *unit;  /* corresponding unit structure */
@@ -312,6 +316,7 @@ public:
   void exclude();
 };
 
+
 struct st_join_table;
 class subselect_uniquesubquery_engine: public subselect_engine
 {
@@ -324,17 +329,17 @@ public:
 				  Item_subselect *subs, Item *where)
     :subselect_engine(thd, subs, 0), tab(tab_arg), cond(where)
   {}
-    
+  ~subselect_uniquesubquery_engine();
   int prepare();
   void fix_length_and_dec(Item_cache** row);
   int exec();
   uint cols() { return 1; }
   bool dependent() { return 1; }
   bool uncacheable() { return 1; }
-  void  exclude();
-  static int end_exec(TABLE *table);
+  void exclude();
 };
 
+
 class subselect_indexsubquery_engine: public subselect_uniquesubquery_engine
 {
   bool check_null;