after review PS fixes

sql/item_cmpfunc.cc:
  merged in one if
sql/mysql_priv.h:
  removed unused paremeter of check_one_table_access
  declaration of new function for SP share code
sql/set_var.cc:
  function descriotion added
  unneeded parantses removed
sql/sql_acl.cc:
  new parameter to limit number of checked tables for check_grant
sql/sql_acl.h:
  new parameter to limit number of checked tables for check_grant
sql/sql_delete.cc:
  preparation moved in separate function
sql/sql_insert.cc:
  preparation moved in separate function
sql/sql_lex.cc:
  comment style fixed
  unneeded assignment removed
sql/sql_parse.cc:
  new parameter to limit number of checked tables for check_grant
  table list manipulation removed (because of above)
  new precheck function
sql/sql_prepare.cc:
  function rewrited to shere code with sql_prepare.cc
  flow control fixed
sql/sql_show.cc:
  new parameter to limit number of checked tables for check_grant
sql/sql_update.cc:
  preparation moved in separate function
sql/table.h:
  flag renamed

1 files changed, 2 insertions, 3 deletions

diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc
index 8da517a8d99..afbf0b7163e 100644
--- a/sql/item_cmpfunc.cc
+++ b/sql/item_cmpfunc.cc
@@ -477,10 +477,9 @@ bool Item_in_optimizer::fix_left(THD *thd,
 				 struct st_table_list *tables,
 				 Item **ref)
 {
-  if ((!args[0]->fixed && args[0]->fix_fields(thd, tables, args)))
+  if (!args[0]->fixed && args[0]->fix_fields(thd, tables, args) ||
+      !cache && !(cache= Item_cache::get_cache(args[0]->result_type())))
     return 1;
-  if (!cache && !(cache= Item_cache::get_cache(args[0]->result_type())))
-      return 1;
 
   cache->setup(args[0]);
   cache->store(args[0]);