summaryrefslogtreecommitdiff
path: root/sql/sql_analyse.cc
diff options
context:
space:
mode:
Diffstat (limited to 'sql/sql_analyse.cc')
-rw-r--r--sql/sql_analyse.cc15
1 files changed, 11 insertions, 4 deletions
diff --git a/sql/sql_analyse.cc b/sql/sql_analyse.cc
index 2259d3bead8..69b7b987152 100644
--- a/sql/sql_analyse.cc
+++ b/sql/sql_analyse.cc
@@ -81,14 +81,18 @@ proc_analyse_init(THD *thd, ORDER *param, select_result *result,
(*param->item)->val_real() < 0)
{
delete pc;
- my_error(ER_WRONG_PARAMETERS_TO_PROCEDURE, MYF(0), proc_name);
+ my_printf_error(ER_WRONG_PARAMETERS_TO_PROCEDURE,
+ ER(ER_WRONG_PARAMETERS_TO_PROCEDURE), MYF(0),
+ proc_name);
DBUG_RETURN(0);
}
pc->max_tree_elements = (uint) (*param->item)->val_int();
param = param->next;
if (param->next) // no third parameter possible
{
- my_error(ER_WRONG_PARAMCOUNT_TO_PROCEDURE, MYF(0), proc_name);
+ my_printf_error(ER_WRONG_PARAMCOUNT_TO_PROCEDURE,
+ ER(ER_WRONG_PARAMCOUNT_TO_PROCEDURE), MYF(0),
+ proc_name);
DBUG_RETURN(0);
}
// second parameter
@@ -96,7 +100,9 @@ proc_analyse_init(THD *thd, ORDER *param, select_result *result,
(*param->item)->val_real() < 0)
{
delete pc;
- my_error(ER_WRONG_PARAMETERS_TO_PROCEDURE, MYF(0), proc_name);
+ my_printf_error(ER_WRONG_PARAMETERS_TO_PROCEDURE,
+ ER(ER_WRONG_PARAMETERS_TO_PROCEDURE), MYF(0),
+ proc_name);
DBUG_RETURN(0);
}
pc->max_treemem = (uint) (*param->item)->val_int();
@@ -105,7 +111,8 @@ proc_analyse_init(THD *thd, ORDER *param, select_result *result,
(*param->item)->val_real() < 0)
{
delete pc;
- my_error(ER_WRONG_PARAMETERS_TO_PROCEDURE, MYF(0), proc_name);
+ my_printf_error(ER_WRONG_PARAMETERS_TO_PROCEDURE,
+ ER(ER_WRONG_PARAMETERS_TO_PROCEDURE), MYF(0), proc_name);
DBUG_RETURN(0);
}
// if only one parameter was given, it will be the value of max_tree_elements