Changed single generic error code/message into different ones for duplicate things.

(For multi-lingual support.)
Also fixed memory leak when aborting parsing for a duplicate cursor.

include/mysqld_error.h

@@ -323,5 +323,8 @@
 #define ER_SP_UNDECLARED_VAR 1304
 #define ER_SP_WRONG_NO_OF_FETCH_ARGS 1305
 #define ER_SP_FETCH_NO_DATA 1306
-#define ER_SP_DUP_THING 1307
-#define ER_ERROR_MESSAGES 308
+#define ER_SP_DUP_PARAM 1307
+#define ER_SP_DUP_VAR 1308
+#define ER_SP_DUP_COND 1309
+#define ER_SP_DUP_CURS 1310
+#define ER_ERROR_MESSAGES 311

mysql-test/r/sp-error.result

@@ -237,7 +237,7 @@ begin
 declare x float;
 declare x int;
 end;
-ERROR HY000: Duplicate parameter: x
+ERROR HY000: Duplicate variable: x
 create procedure p()
 begin
 declare c condition for 1064;

mysql-test/t/sp-error.test

@@ -311,19 +311,22 @@ end|
 create function p(x int, x char(10))
 begin
 end|
---error 1307
+
+--error 1308
 create procedure p()
 begin
   declare x float;
   declare x int;
 end|
---error 1307
+
+--error 1309
 create procedure p()
 begin
   declare c condition for 1064;
   declare c condition for 1065;
 end|
---error 1307
+
+--error 1310
 create procedure p()
 begin
   declare c cursor for select * from t1;

sql/share/czech/errmsg.txt

@@ -319,4 +319,7 @@ character-set=latin2
 "Undeclared variable: %s"
 "Wrong number of FETCH variables"
 "No data to FETCH"
-"Duplicate %s: %s"
+"Duplicate parameter: %s"
+"Duplicate variable: %s"
+"Duplicate condition: %s"
+"Duplicate cursor: %s"

sql/share/danish/errmsg.txt

@@ -313,4 +313,7 @@ character-set=latin1
 "Undeclared variable: %s"
 "Wrong number of FETCH variables"
 "No data to FETCH"
-"Duplicate %s: %s"
+"Duplicate parameter: %s"
+"Duplicate variable: %s"
+"Duplicate condition: %s"
+"Duplicate cursor: %s"

sql/share/dutch/errmsg.txt

@@ -321,4 +321,7 @@ character-set=latin1
 "Undeclared variable: %s"
 "Wrong number of FETCH variables"
 "No data to FETCH"
-"Duplicate %s: %s"
+"Duplicate parameter: %s"
+"Duplicate variable: %s"
+"Duplicate condition: %s"
+"Duplicate cursor: %s"

sql/share/english/errmsg.txt

@@ -310,4 +310,7 @@ character-set=latin1
 "Undeclared variable: %s"
 "Wrong number of FETCH variables"
 "No data to FETCH"
-"Duplicate %s: %s"
+"Duplicate parameter: %s"
+"Duplicate variable: %s"
+"Duplicate condition: %s"
+"Duplicate cursor: %s"

sql/share/estonian/errmsg.txt

@@ -315,4 +315,7 @@ character-set=latin7
 "Undeclared variable: %s"
 "Wrong number of FETCH variables"
 "No data to FETCH"
-"Duplicate %s: %s"
+"Duplicate parameter: %s"
+"Duplicate variable: %s"
+"Duplicate condition: %s"
+"Duplicate cursor: %s"

sql/share/french/errmsg.txt

@@ -310,4 +310,7 @@ character-set=latin1
 "Undeclared variable: %s"
 "Wrong number of FETCH variables"
 "No data to FETCH"
-"Duplicate %s: %s"
+"Duplicate parameter: %s"
+"Duplicate variable: %s"
+"Duplicate condition: %s"
+"Duplicate cursor: %s"

sql/share/german/errmsg.txt

@@ -322,4 +322,7 @@ character-set=latin1
 "Undeclared variable: %s"
 "Wrong number of FETCH variables"
 "No data to FETCH"
-"Duplicate %s: %s"
+"Duplicate parameter: %s"
+"Duplicate variable: %s"
+"Duplicate condition: %s"
+"Duplicate cursor: %s"

sql/share/greek/errmsg.txt

@@ -310,4 +310,7 @@ character-set=greek
 "Undeclared variable: %s"
 "Wrong number of FETCH variables"
 "No data to FETCH"
-"Duplicate %s: %s"
+"Duplicate parameter: %s"
+"Duplicate variable: %s"
+"Duplicate condition: %s"
+"Duplicate cursor: %s"

sql/share/hungarian/errmsg.txt

@@ -312,4 +312,7 @@ character-set=latin2
 "Undeclared variable: %s"
 "Wrong number of FETCH variables"
 "No data to FETCH"
-"Duplicate %s: %s"
+"Duplicate parameter: %s"
+"Duplicate variable: %s"
+"Duplicate condition: %s"
+"Duplicate cursor: %s"

sql/share/italian/errmsg.txt

@@ -310,4 +310,7 @@ character-set=latin1
 "Undeclared variable: %s"
 "Wrong number of FETCH variables"
 "No data to FETCH"
-"Duplicate %s: %s"
+"Duplicate parameter: %s"
+"Duplicate variable: %s"
+"Duplicate condition: %s"
+"Duplicate cursor: %s"

sql/share/japanese/errmsg.txt

@@ -312,4 +312,7 @@ character-set=ujis
 "Undeclared variable: %s"
 "Wrong number of FETCH variables"
 "No data to FETCH"
-"Duplicate %s: %s"
+"Duplicate parameter: %s"
+"Duplicate variable: %s"
+"Duplicate condition: %s"
+"Duplicate cursor: %s"

sql/share/korean/errmsg.txt

@@ -310,4 +310,7 @@ character-set=euckr
 "Undeclared variable: %s"
 "Wrong number of FETCH variables"
 "No data to FETCH"
-"Duplicate %s: %s"
+"Duplicate parameter: %s"
+"Duplicate variable: %s"
+"Duplicate condition: %s"
+"Duplicate cursor: %s"

sql/share/norwegian-ny/errmsg.txt

@@ -312,4 +312,7 @@ character-set=latin1
 "Undeclared variable: %s"
 "Wrong number of FETCH variables"
 "No data to FETCH"
-"Duplicate %s: %s"
+"Duplicate parameter: %s"
+"Duplicate variable: %s"
+"Duplicate condition: %s"
+"Duplicate cursor: %s"

sql/share/norwegian/errmsg.txt

@@ -312,4 +312,7 @@ character-set=latin1
 "Undeclared variable: %s"
 "Wrong number of FETCH variables"
 "No data to FETCH"
-"Duplicate %s: %s"
+"Duplicate parameter: %s"
+"Duplicate variable: %s"
+"Duplicate condition: %s"
+"Duplicate cursor: %s"

sql/share/polish/errmsg.txt

@@ -314,4 +314,7 @@ character-set=latin2
 "Undeclared variable: %s"
 "Wrong number of FETCH variables"
 "No data to FETCH"
-"Duplicate %s: %s"
+"Duplicate parameter: %s"
+"Duplicate variable: %s"
+"Duplicate condition: %s"
+"Duplicate cursor: %s"

sql/share/portuguese/errmsg.txt

@@ -311,4 +311,7 @@ character-set=latin1
 "Undeclared variable: %s"
 "Wrong number of FETCH variables"
 "No data to FETCH"
-"Duplicate %s: %s"
+"Duplicate parameter: %s"
+"Duplicate variable: %s"
+"Duplicate condition: %s"
+"Duplicate cursor: %s"

sql/share/romanian/errmsg.txt

@@ -314,4 +314,7 @@ character-set=latin2
 "Undeclared variable: %s"
 "Wrong number of FETCH variables"
 "No data to FETCH"
-"Duplicate %s: %s"
+"Duplicate parameter: %s"
+"Duplicate variable: %s"
+"Duplicate condition: %s"
+"Duplicate cursor: %s"

sql/share/russian/errmsg.txt

@@ -312,4 +312,7 @@ character-set=koi8r
 "Undeclared variable: %s"
 "Wrong number of FETCH variables"
 "No data to FETCH"
-"Duplicate %s: %s"
+"Duplicate parameter: %s"
+"Duplicate variable: %s"
+"Duplicate condition: %s"
+"Duplicate cursor: %s"

sql/share/serbian/errmsg.txt

@@ -305,4 +305,7 @@ character-set=cp1250
 "Undeclared variable: %s"
 "Wrong number of FETCH variables"
 "No data to FETCH"
-"Duplicate %s: %s"
+"Duplicate parameter: %s"
+"Duplicate variable: %s"
+"Duplicate condition: %s"
+"Duplicate cursor: %s"

sql/share/slovak/errmsg.txt

@@ -318,4 +318,7 @@ character-set=latin2
 "Undeclared variable: %s"
 "Wrong number of FETCH variables"
 "No data to FETCH"
-"Duplicate %s: %s"
+"Duplicate parameter: %s"
+"Duplicate variable: %s"
+"Duplicate condition: %s"
+"Duplicate cursor: %s"

sql/share/spanish/errmsg.txt

@@ -312,4 +312,7 @@ character-set=latin1
 "Undeclared variable: %s"
 "Wrong number of FETCH variables"
 "No data to FETCH"
-"Duplicate %s: %s"
+"Duplicate parameter: %s"
+"Duplicate variable: %s"
+"Duplicate condition: %s"
+"Duplicate cursor: %s"

sql/share/swedish/errmsg.txt

@@ -310,4 +310,7 @@ character-set=latin1
 "Undeclared variable: %s"
 "Wrong number of FETCH variables"
 "No data to FETCH"
-"Duplicate %s: %s"
+"Duplicate parameter: %s"
+"Duplicate variable: %s"
+"Duplicate condition: %s"
+"Duplicate cursor: %s"

sql/share/ukrainian/errmsg.txt

@@ -315,4 +315,7 @@ character-set=koi8u
 "Undeclared variable: %s"
 "Wrong number of FETCH variables"
 "No data to FETCH"
-"Duplicate %s: %s"
+"Duplicate parameter: %s"
+"Duplicate variable: %s"
+"Duplicate condition: %s"
+"Duplicate cursor: %s"

sql/sql_yacc.yy

@@ -1155,7 +1155,7 @@ sp_fdparam:
 
 	    if (spc->find_pvar(&$1, TRUE))
 	    {
-	      net_printf(YYTHD, ER_SP_DUP_THING, "parameter", $1.str);
+	      net_printf(YYTHD, ER_SP_DUP_PARAM, $1.str);
 	      YYABORT;
 	    }
 	    spc->push_pvar(&$1, (enum enum_field_types)$2, sp_param_in);
@@ -1181,7 +1181,7 @@ sp_pdparam:
 
 	    if (spc->find_pvar(&$2, TRUE))
 	    {
-	      net_printf(YYTHD, ER_SP_DUP_THING, "parameter", $2.str);
+	      net_printf(YYTHD, ER_SP_DUP_PARAM, $2.str);
 	      YYABORT;
 	    }
 	    spc->push_pvar(&$2, (enum enum_field_types)$3,
@@ -1252,7 +1252,7 @@ sp_decl:
 
 	    if (spc->find_cond(&$2, TRUE))
 	    {
-	      net_printf(YYTHD, ER_SP_DUP_THING, "condition", $2.str);
+	      net_printf(YYTHD, ER_SP_DUP_COND, $2.str);
 	      YYABORT;
 	    }
 	    YYTHD->lex->spcont->push_cond(&$2, $5);
@@ -1302,7 +1302,8 @@ sp_decl:
 
 	    if (spc->find_cursor(&$2, &offp, TRUE))
 	    {
-	      net_printf(YYTHD, ER_SP_DUP_THING, "cursor", $2.str);
+	      net_printf(YYTHD, ER_SP_DUP_CURS, $2.str);
+	      delete $5;
 	      YYABORT;
 	    }
             i= new sp_instr_cpush(sp->instructions(), $5);
@@ -1432,7 +1433,7 @@ sp_decl_idents:
 
 	    if (spc->find_pvar(&$1, TRUE))
 	    {
-	      net_printf(YYTHD, ER_SP_DUP_THING, "parameter", $1.str);
+	      net_printf(YYTHD, ER_SP_DUP_VAR, $1.str);
 	      YYABORT;
 	    }
 	    spc->push_pvar(&$1, (enum_field_types)0, sp_param_in);
@@ -1445,7 +1446,7 @@ sp_decl_idents:
 
 	    if (spc->find_pvar(&$3, TRUE))
 	    {
-	      net_printf(YYTHD, ER_SP_DUP_THING, "parameter", $3.str);
+	      net_printf(YYTHD, ER_SP_DUP_VAR, $3.str);
 	      YYABORT;
 	    }
 	    spc->push_pvar(&$3, (enum_field_types)0, sp_param_in);