bzr commit into mysql-6.0 branch (gshchepa:2837)

[Gleb Shchepa]

#At file:///work/bzr/mysql-6.0-5.1.29-rc/

 2837 Gleb Shchepa	2008-09-18 [merge]
      merge 5.1-5.1.29-rc --> 6.0-5.1.29-rc
modified:
  sql/item_func.cc

=== modified file 'sql/item_func.cc'
--- a/sql/item_func.cc	2008-09-18 09:06:39 +0000
+++ b/sql/item_func.cc	2008-09-18 12:29:47 +0000
@@ -3888,7 +3888,7 @@ static user_var_entry *get_variable(HASH
 bool Item_func_set_user_var::set_entry(THD *thd, bool create_if_not_exists)
 {
   if (thd == entry_thd && entry)
-    return FALSE;
+    goto end; // update entry->update_query_id for PS
   entry_thd= thd;
   if (!(entry= get_variable(&thd->user_vars, name, create_if_not_exists)))
     return TRUE;
@@ -3897,6 +3897,7 @@ bool Item_func_set_user_var::set_entry(T
      if this variable is a constant item in the query (it is if update_query_id
      is different from query_id).
   */
+end:
   entry->update_query_id= thd->query_id;
   return FALSE;
 }