Merge mysql.com:/home/ram/work/b30200/b30200.5.0

into  mysql.com:/home/ram/work/b30200/b30200.5.1


sql/item_func.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/item_create.cc:
  manual merge.

sql/item_create.cc

@@ -2861,7 +2861,6 @@ Item*
 Create_func_connection_id::create(THD *thd)
 {
   thd->lex->safe_to_cache_query= 0;
-  thd->thread_specific_used= TRUE;
   return new (thd->mem_root) Item_func_connection_id();
 }
 

sql/item_func.cc

@@ -649,6 +649,7 @@ bool Item_func_connection_id::fix_fields(THD *thd, Item **ref)
 {
   if (Item_int_func::fix_fields(thd, ref))
     return TRUE;
+  thd->thread_specific_used= TRUE;
   value= thd->variables.pseudo_thread_id;
   return FALSE;
 }