Merge commit

sql/field.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/lex.h:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

1 files changed, 9 insertions, 1 deletions

diff --git a/sql/item.h b/sql/item.h
index 517d3f311e5..c738f92124f 100644
--- a/sql/item.h
+++ b/sql/item.h
@@ -113,6 +113,14 @@ public:
   my_bool with_sum_func;
   my_bool fixed;                        /* If item fixed with fix_fields */
   DTCollation collation;
+
+
+  /*
+    thd is current_thd value. Like some other Item's fields it
+    will be a problem for using one Item in different threads
+    (as stored procedures may want to do in the future)
+  */
+  THD *thd;
   
   // alloc & destruct is done as start of select using sql_alloc
   Item();
@@ -124,7 +132,7 @@ public:
      top AND/OR ctructure of WHERE clause to protect it of
      optimisation changes in prepared statements
   */
-  Item(THD *thd, Item &item);
+  Item(THD *c_thd, Item &item);
   virtual ~Item() { name=0; }		/*lint -e1509 */
   void set_name(const char *str,uint length, CHARSET_INFO *cs);
   void init_make_field(Send_field *tmp_field,enum enum_field_types type);