1 files changed, 99 insertions, 0 deletions

diff --git a/sql/item.h b/sql/item.h
index 902f42dd07c..9f6aa5a9a32 100644
--- a/sql/item.h
+++ b/sql/item.h
@@ -110,6 +110,7 @@ public:
   my_string name;			/* Name from select */
   Item *next;
   uint32 max_length;
+  uint name_length;                     /* Length of name */
   uint8 marker,decimals;
   my_bool maybe_null;			/* If item may be null */
   my_bool null_value;			/* if item is null */
@@ -229,6 +230,9 @@ public:
   virtual bool remove_dependence_processor(byte * arg) { return 0; }
   virtual bool remove_fixed(byte * arg) { fixed= 0; return 0; }
   
+  virtual Item *this_item() { return this; } /* For SPs mostly. */
+  virtual Item *this_const_item() const { return const_cast<Item*>(this); } /* For SPs mostly. */
+
   // Row emulation
   virtual uint cols() { return 1; }
   virtual Item* el(uint i) { return this; }
@@ -251,6 +255,101 @@ public:
 };
 
 
+// A local SP variable (incl. parameters), used in runtime
+class Item_splocal : public Item
+{
+private:
+  
+  uint m_offset;
+  LEX_STRING m_name;
+
+public:
+
+  Item_splocal(LEX_STRING name, uint offset)
+    : m_offset(offset), m_name(name)
+  {
+    Item::maybe_null= TRUE;
+  }
+
+  Item *this_item();
+  Item *this_const_item() const;
+
+  inline uint get_offset()
+  {
+    return m_offset;
+  }
+
+  // Abstract methods inherited from Item. Just defer the call to
+  // the item in the frame
+  enum Type type() const;
+
+  inline double val()
+  {
+    Item *it= this_item();
+    double ret= it->val();
+    Item::null_value= it->null_value;
+    return ret;
+  }
+
+  inline longlong val_int()
+  {
+    Item *it= this_item();
+    longlong ret= it->val_int();
+    Item::null_value= it->null_value;
+    return ret;
+  }
+
+  inline String *val_str(String *sp)
+  {
+    Item *it= this_item();
+    String *ret= it->val_str(sp);
+    Item::null_value= it->null_value;
+    return ret;
+  }
+
+  inline bool is_null()
+  {
+    Item *it= this_item();
+    bool ret= it->is_null();
+    Item::null_value= it->null_value;
+    return ret;
+  }
+
+  inline void make_field(Send_field *field)
+  {
+    Item *it= this_item();
+
+    it->set_name(m_name.str, m_name.length, system_charset_info);
+    it->make_field(field);
+  }
+
+  inline Item_result result_type() const
+  {
+    return this_const_item()->result_type();
+  }
+
+  inline bool const_item() const
+  {
+    return FALSE;
+  }
+
+  inline int save_in_field(Field *field, bool no_conversions)
+  {
+    return this_item()->save_in_field(field, no_conversions);
+  }
+
+  inline void print(String *str)
+  {
+    str->append(m_name.str, m_name.length);
+  }
+
+  inline bool send(Protocol *protocol, String *str)
+  {
+    return this_item()->send(protocol, str);
+  }
+};
+
+
 class Item_num: public Item
 {
 public: