Merge bk-internal.mysql.com:/home/bk/mysql-5.0

into mysql.com:/home/dlenev/src/mysql-5.0-merges

Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/dlenev/src/mysql-5.0-merges
246c12ed · dlenev@mysql.com · 8d129218 · 4821559e · 246c12ed
Commit 246c12ed authored Dec 07, 2005 by dlenev@mysql.com
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

sql/sp_head.cc sql/sp_head.cc +2 -2

No files found.
--- a/sql/sp_head.cc
+++ b/sql/sp_head.cc
@@ -1518,8 +1518,8 @@ sp_head::execute_procedure(THD *thd, List<Item> *args)
            Item_func_set_user_var is not fixed after construction,
            call fix_fields().
 	  */
-          if ((ret= test(!suv || suv->fix_fields(thd, &item) ||
-                         suv->check() || suv->update())))
+          if ((err_status= test(!suv || suv->fix_fields(thd, &item) ||
+                                suv->check() || suv->update())))
            break;
 	}
      }