summaryrefslogtreecommitdiff
path: root/sql/sql_analyse.cc
diff options
context:
space:
mode:
authormonty@narttu.mysql.fi <>2003-02-26 00:22:35 +0200
committermonty@narttu.mysql.fi <>2003-02-26 00:22:35 +0200
commit326b8abc898641baa561dcdc7badff6653626953 (patch)
tree7ab76a019795a4806b97cb19efc02d2efcfaff5e /sql/sql_analyse.cc
parentc75a4d2468d93c552b81d34795e7d274ec7241f5 (diff)
parente6c575dacc5e5df7e0ffa727bb45056cea3d4441 (diff)
downloadmariadb-git-326b8abc898641baa561dcdc7badff6653626953.tar.gz
merge with 3.23 to get corrected error message files and rename of files in mysql-test
Diffstat (limited to 'sql/sql_analyse.cc')
-rw-r--r--sql/sql_analyse.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/sql_analyse.cc b/sql/sql_analyse.cc
index cbd586b8d30..a75b7e304d1 100644
--- a/sql/sql_analyse.cc
+++ b/sql/sql_analyse.cc
@@ -89,6 +89,7 @@ proc_analyse_init(THD *thd, ORDER *param, select_result *result,
if ((*param->item)->type() != Item::INT_ITEM ||
(*param->item)->val() < 0)
{
+ delete pc;
net_printf(&thd->net, ER_WRONG_PARAMETERS_TO_PROCEDURE, proc_name);
DBUG_RETURN(0);
}
@@ -96,6 +97,7 @@ proc_analyse_init(THD *thd, ORDER *param, select_result *result,
param = param->next;
if (param->next) // no third parameter possible
{
+ delete pc;
net_printf(&thd->net, ER_WRONG_PARAMCOUNT_TO_PROCEDURE, proc_name);
DBUG_RETURN(0);
}
@@ -103,6 +105,7 @@ proc_analyse_init(THD *thd, ORDER *param, select_result *result,
if ((*param->item)->type() != Item::INT_ITEM ||
(*param->item)->val() < 0)
{
+ delete pc;
net_printf(&thd->net, ER_WRONG_PARAMETERS_TO_PROCEDURE, proc_name);
DBUG_RETURN(0);
}
@@ -111,6 +114,7 @@ proc_analyse_init(THD *thd, ORDER *param, select_result *result,
else if ((*param->item)->type() != Item::INT_ITEM ||
(*param->item)->val() < 0)
{
+ delete pc;
net_printf(&thd->net, ER_WRONG_PARAMETERS_TO_PROCEDURE, proc_name);
DBUG_RETURN(0);
}