mirror of
https://github.com/MariaDB/server.git
synced 2026-01-06 05:22:24 +03:00
Rename: Item::val -> Item::val_real().
sql/filesort.cc: val -> val_real sql/item.cc: val -> val_real sql/item.h: val -> val_real sql/item_buff.cc: val -> val_real sql/item_cmpfunc.cc: val -> val_real sql/item_cmpfunc.h: val -> val_real sql/item_func.cc: val -> val_real sql/item_func.h: val -> val_real sql/item_geofunc.cc: val -> val_real sql/item_geofunc.h: val -> val_real sql/item_row.h: val -> val_real sql/item_strfunc.cc: val -> val_real sql/item_strfunc.h: val -> val_real sql/item_subselect.cc: val -> val_real sql/item_subselect.h: val -> val_real sql/item_sum.cc: val -> val_real sql/item_sum.h: val -> val_real sql/item_timefunc.h: val -> val_real sql/item_uniq.h: val -> val_real sql/procedure.h: val -> val_real sql/sp_head.cc: val -> val_real sql/sql_analyse.cc: val -> val_real sql/sql_class.cc: val -> val_real sql/sql_select.cc: val -> val_real
This commit is contained in:
@@ -78,7 +78,7 @@ proc_analyse_init(THD *thd, ORDER *param, select_result *result,
|
||||
{
|
||||
// first parameter
|
||||
if ((*param->item)->type() != Item::INT_ITEM ||
|
||||
(*param->item)->val() < 0)
|
||||
(*param->item)->val_real() < 0)
|
||||
{
|
||||
delete pc;
|
||||
my_error(ER_WRONG_PARAMETERS_TO_PROCEDURE, MYF(0), proc_name);
|
||||
@@ -93,7 +93,7 @@ proc_analyse_init(THD *thd, ORDER *param, select_result *result,
|
||||
}
|
||||
// second parameter
|
||||
if ((*param->item)->type() != Item::INT_ITEM ||
|
||||
(*param->item)->val() < 0)
|
||||
(*param->item)->val_real() < 0)
|
||||
{
|
||||
delete pc;
|
||||
my_error(ER_WRONG_PARAMETERS_TO_PROCEDURE, MYF(0), proc_name);
|
||||
@@ -102,7 +102,7 @@ proc_analyse_init(THD *thd, ORDER *param, select_result *result,
|
||||
pc->max_treemem = (uint) (*param->item)->val_int();
|
||||
}
|
||||
else if ((*param->item)->type() != Item::INT_ITEM ||
|
||||
(*param->item)->val() < 0)
|
||||
(*param->item)->val_real() < 0)
|
||||
{
|
||||
delete pc;
|
||||
my_error(ER_WRONG_PARAMETERS_TO_PROCEDURE, MYF(0), proc_name);
|
||||
@@ -364,7 +364,7 @@ void field_str::add()
|
||||
void field_real::add()
|
||||
{
|
||||
char buff[MAX_FIELD_WIDTH], *ptr, *end;
|
||||
double num = item->val();
|
||||
double num= item->val_real();
|
||||
uint length, zero_count, decs;
|
||||
TREE_ELEMENT *element;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user