Merge mysqldev@production.mysql.com:my/mysql-5.0-release

into mysql.com:/home/psergey/mysql-5.0-bug12335-release2

sql/sp_head.cc

@@ -672,8 +672,12 @@ static bool subst_spvars(THD *thd, sp_instr *instr, LEX_STRING *query_str)
     /* Find all instances of item_splocal used in this statement */
     for (Item *item= instr->free_list; item; item= item->next)
     {
-      if (item->is_splocal() && ((Item_splocal*)item)->pos_in_query)
-        sp_vars_uses.append((Item_splocal*)item);
+      if (item->is_splocal())
+      {
+        Item_splocal *item_spl= (Item_splocal*)item;
+        if (item_spl->pos_in_query)
+          sp_vars_uses.append(item_spl);
+      }
     }
     if (!sp_vars_uses.elements())
       DBUG_RETURN(0);