Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt

into  magare.gmz:/home/kgeorge/mysql/autopush/B31157-5.1-opt

2 files changed, 9 insertions, 1 deletions

diff --git a/sql/item_func.cc b/sql/item_func.cc
index 057f86ac230..21fd944de76 100644
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@@ -3624,10 +3624,17 @@ longlong Item_func_last_insert_id::val_int()
     thd->first_successful_insert_id_in_prev_stmt= value;
     return value;
   }
-  thd->lex->uncacheable(UNCACHEABLE_SIDEEFFECT);
   return thd->read_first_successful_insert_id_in_prev_stmt();
 }
 
+
+bool Item_func_last_insert_id::fix_fields(THD *thd, Item **ref)
+{
+  thd->lex->uncacheable(UNCACHEABLE_SIDEEFFECT);
+  return Item_int_func::fix_fields(thd, ref);
+}
+
+
 /* This function is just used to test speed of different functions */
 
 longlong Item_func_benchmark::val_int()
diff --git a/sql/item_func.h b/sql/item_func.h
index c22eb9b9cd9..6a3d230d2f2 100644
--- a/sql/item_func.h
+++ b/sql/item_func.h
@@ -935,6 +935,7 @@ public:
     if (arg_count)
       max_length= args[0]->max_length;
   }
+  bool fix_fields(THD *thd, Item **ref);
 };