From 7b4a85050b59f6148e8ab4e6f3ae92aa1427f170 Mon Sep 17 00:00:00 2001
From: unknown <pem@mysql.comhem.se>
Date: Fri, 14 Nov 2003 13:46:50 +0100
Subject: 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:
  Changed single generic error code/message into different ones for duplicate things.
  (For multi-lingual support.)
mysql-test/r/sp-error.result:
  Fixed error message for duplicate variable.
mysql-test/t/sp-error.test:
  Changed single generic error code/message into different ones for duplicate things.
  (For multi-lingual support.)
sql/share/czech/errmsg.txt:
  Changed single generic error code/message into different ones for duplicate things.
  (For multi-lingual support.)
sql/share/danish/errmsg.txt:
  Changed single generic error code/message into different ones for duplicate things.
  (For multi-lingual support.)
sql/share/dutch/errmsg.txt:
  Changed single generic error code/message into different ones for duplicate things.
  (For multi-lingual support.)
sql/share/english/errmsg.txt:
  Changed single generic error code/message into different ones for duplicate things.
  (For multi-lingual support.)
sql/share/estonian/errmsg.txt:
  Changed single generic error code/message into different ones for duplicate things.
  (For multi-lingual support.)
sql/share/french/errmsg.txt:
  Changed single generic error code/message into different ones for duplicate things.
  (For multi-lingual support.)
sql/share/german/errmsg.txt:
  Changed single generic error code/message into different ones for duplicate things.
  (For multi-lingual support.)
sql/share/greek/errmsg.txt:
  Changed single generic error code/message into different ones for duplicate things.
  (For multi-lingual support.)
sql/share/hungarian/errmsg.txt:
  Changed single generic error code/message into different ones for duplicate things.
  (For multi-lingual support.)
sql/share/italian/errmsg.txt:
  Changed single generic error code/message into different ones for duplicate things.
  (For multi-lingual support.)
sql/share/japanese/errmsg.txt:
  Changed single generic error code/message into different ones for duplicate things.
  (For multi-lingual support.)
sql/share/korean/errmsg.txt:
  Changed single generic error code/message into different ones for duplicate things.
  (For multi-lingual support.)
sql/share/norwegian-ny/errmsg.txt:
  Changed single generic error code/message into different ones for duplicate things.
  (For multi-lingual support.)
sql/share/norwegian/errmsg.txt:
  Changed single generic error code/message into different ones for duplicate things.
  (For multi-lingual support.)
sql/share/polish/errmsg.txt:
  Changed single generic error code/message into different ones for duplicate things.
  (For multi-lingual support.)
sql/share/portuguese/errmsg.txt:
  Changed single generic error code/message into different ones for duplicate things.
  (For multi-lingual support.)
sql/share/romanian/errmsg.txt:
  Changed single generic error code/message into different ones for duplicate things.
  (For multi-lingual support.)
sql/share/russian/errmsg.txt:
  Changed single generic error code/message into different ones for duplicate things.
  (For multi-lingual support.)
sql/share/serbian/errmsg.txt:
  Changed single generic error code/message into different ones for duplicate things.
  (For multi-lingual support.)
sql/share/slovak/errmsg.txt:
  Changed single generic error code/message into different ones for duplicate things.
  (For multi-lingual support.)
sql/share/spanish/errmsg.txt:
  Changed single generic error code/message into different ones for duplicate things.
  (For multi-lingual support.)
sql/share/swedish/errmsg.txt:
  Changed single generic error code/message into different ones for duplicate things.
  (For multi-lingual support.)
sql/share/ukrainian/errmsg.txt:
  Changed single generic error code/message into different ones for duplicate things.
  (For multi-lingual support.)
---
 mysql-test/t/sp-error.test | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'mysql-test/t/sp-error.test')

diff --git a/mysql-test/t/sp-error.test b/mysql-test/t/sp-error.test
index 09a1e196786..d98385b42e0 100644
--- a/mysql-test/t/sp-error.test
+++ b/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;
-- 
cgit v1.2.1