summaryrefslogtreecommitdiff
path: root/sql/item_func.cc
diff options
context:
space:
mode:
authorunknown <pem@mysql.com>2006-04-18 11:16:39 +0200
committerunknown <pem@mysql.com>2006-04-18 11:16:39 +0200
commitd9142f992ee5c60a487cb631594ff27352df7f64 (patch)
tree63d065ca0fe8c71b7e0ec596579b320f41e5ae75 /sql/item_func.cc
parent9381c8a0896bcb67ce9be44463456313d485ad00 (diff)
downloadmariadb-git-d9142f992ee5c60a487cb631594ff27352df7f64.tar.gz
Post-review fix for BUG#18787. Renamed a local variable in
Item_func_sp::tmp_table_field() to something more descriptive. sql/item_func.cc: Renamed local variable 'res' to 'field' in Item_func_sp::tmp_table_field(), because it is.
Diffstat (limited to 'sql/item_func.cc')
-rw-r--r--sql/item_func.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc
index 8d30fafbe63..32b1075c99a 100644
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@@ -4909,19 +4909,19 @@ longlong Item_func_found_rows::val_int()
Field *
Item_func_sp::tmp_table_field(TABLE *t_arg)
{
- Field *res= 0;
+ Field *field= 0;
DBUG_ENTER("Item_func_sp::tmp_table_field");
if (m_sp)
- res= m_sp->create_result_field(max_length, (const char*) name, t_arg);
+ field= m_sp->create_result_field(max_length, (const char*) name, t_arg);
- if (!res)
- res= Item_func::tmp_table_field(t_arg);
+ if (!field)
+ field= Item_func::tmp_table_field(t_arg);
- if (!res)
+ if (!field)
my_message(ER_OUT_OF_RESOURCES, ER(ER_OUT_OF_RESOURCES), MYF(0));
- DBUG_RETURN(res);
+ DBUG_RETURN(field);
}