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, 2 insertions, 2 deletions

diff --git a/sql/ha_myisam.cc b/sql/ha_myisam.cc
index cec1aefa2d5..864ee55a85f 100644
--- a/sql/ha_myisam.cc
+++ b/sql/ha_myisam.cc
@@ -898,7 +898,7 @@ int ha_myisam::index_read(byte * buf, const byte * key,
 			  uint key_len, enum ha_rkey_function find_flag)
 {
   statistic_increment(ha_read_key_count,&LOCK_status);
-  int error=mi_rkey(file,buf,active_index, key, key_len, (enum ha_rkey_function)find_flag);
+  int error=mi_rkey(file,buf,active_index, key, key_len, find_flag);
   table->status=error ? STATUS_NOT_FOUND: 0;
   return error;
 }
@@ -907,7 +907,7 @@ int ha_myisam::index_read_idx(byte * buf, uint index, const byte * key,
 			      uint key_len, enum ha_rkey_function find_flag)
 {
   statistic_increment(ha_read_key_count,&LOCK_status);
-  int error=mi_rkey(file,buf,index, key, key_len, (enum ha_rkey_function)find_flag);
+  int error=mi_rkey(file,buf,index, key, key_len, find_flag);
   table->status=error ? STATUS_NOT_FOUND: 0;
   return error;
 }