Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1

into genie.(none):/home/hf/work/mysql-4.1.lck


sql/item_create.cc:
  Auto merged
sql/item_create.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/lex.h:
  Auto merged

1 files changed, 6 insertions, 0 deletions

diff --git a/sql/item_create.cc b/sql/item_create.cc
index b80327b657a..3bc6fa47e83 100644
--- a/sql/item_create.cc
+++ b/sql/item_create.cc
@@ -475,6 +475,12 @@ Item *create_func_is_free_lock(Item* a)
   return new Item_func_is_free_lock(a);
 }
 
+Item *create_func_is_used_lock(Item* a)
+{
+  current_thd->lex.uncacheable();
+  return new Item_func_is_used_lock(a);
+}
+
 Item *create_func_quote(Item* a)
 {
   return new Item_func_quote(a);