diff options
| author | unknown <dlenev@mysql.com> | 2005-12-07 21:21:54 +0300 |
|---|---|---|
| committer | unknown <dlenev@mysql.com> | 2005-12-07 21:21:54 +0300 |
| commit | ae2377c407afcc0eba3edbd54ca493a72b4241a6 (patch) | |
| tree | b9cdc00903f99378109b0ed32e24012375486e9c /sql/sp_head.cc | |
| parent | 4da61404a603d1a0cebef80ef727282764d537ce (diff) | |
| parent | 5213f5894a043b74f12d2be1a43e30de3d5e6b69 (diff) | |
| download | mariadb-git-ae2377c407afcc0eba3edbd54ca493a72b4241a6.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/dlenev/src/mysql-5.0-merges
sql/sp_head.cc:
Auto merged
Diffstat (limited to 'sql/sp_head.cc')
| -rw-r--r-- | sql/sp_head.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sp_head.cc b/sql/sp_head.cc index d1f1115ee4e..18bcd8b94d0 100644 --- 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; } } |