summaryrefslogtreecommitdiff
path: root/sql/share
diff options
context:
space:
mode:
authorunknown <pem@mysql.com>2003-01-15 15:39:36 +0100
committerunknown <pem@mysql.com>2003-01-15 15:39:36 +0100
commit79993565a9d0c534a1aade553df5412173c37bf4 (patch)
treed2dbad2cc990db2c312124ef17cd90ebbd19977d /sql/share
parentbc543f69971fb0737cde034ae3477aa0ce937858 (diff)
downloadmariadb-git-79993565a9d0c534a1aade553df5412173c37bf4.tar.gz
Fixed some basic error handling for SP functions in mysql_execute_command().
include/mysqld_error.h: Added error codes for SPs sql/mysql_priv.h: Changed return value of mysql_execute_command() from void to int; need to be able to detect if executions of substatements in SPs failed. sql/share/czech/errmsg.txt: Added error messages for SPs. sql/share/danish/errmsg.txt: Added error messages for SPs. sql/share/dutch/errmsg.txt: Added error messages for SPs. sql/share/english/errmsg.txt: Added error messages for SPs. sql/share/estonian/errmsg.txt: Added error messages for SPs. sql/share/french/errmsg.txt: Added error messages for SPs. sql/share/german/errmsg.txt: Added error messages for SPs. sql/share/greek/errmsg.txt: Added error messages for SPs. sql/share/hungarian/errmsg.txt: Added error messages for SPs. sql/share/italian/errmsg.txt: Added error messages for SPs. sql/share/japanese/errmsg.txt: Added error messages for SPs. sql/share/korean/errmsg.txt: Added error messages for SPs. sql/share/norwegian-ny/errmsg.txt: Added error messages for SPs. sql/share/norwegian/errmsg.txt: Added error messages for SPs. sql/share/polish/errmsg.txt: Added error messages for SPs. sql/share/portuguese/errmsg.txt: Added error messages for SPs. sql/share/romanian/errmsg.txt: Added error messages for SPs. sql/share/russian/errmsg.txt: Added error messages for SPs. sql/share/serbian/errmsg.txt: Added error messages for SPs. sql/share/slovak/errmsg.txt: Added error messages for SPs. sql/share/spanish/errmsg.txt: Added error messages for SPs. sql/share/swedish/errmsg.txt: Added error messages for SPs. sql/share/ukrainian/errmsg.txt: Added error messages for SPs. sql/sp_head.cc: Moved net.no_send_ok fiddling to sql_parse.cc. Check if mysql_execute_command() failed. sql/sql_parse.cc: Changed return value of mysql_execute_command() from void to int; need to be able to detect if executions of substatements in SPs failed. Fixed all returns accordingly. Added error checks for SQLCOM_CREATE_PROCEDURE, CALL, ALTER_PROCEDURE, and DROP_PROCEDURE.
Diffstat (limited to 'sql/share')
-rw-r--r--sql/share/czech/errmsg.txt6
-rw-r--r--sql/share/danish/errmsg.txt6
-rw-r--r--sql/share/dutch/errmsg.txt6
-rw-r--r--sql/share/english/errmsg.txt7
-rw-r--r--sql/share/estonian/errmsg.txt6
-rw-r--r--sql/share/french/errmsg.txt6
-rw-r--r--sql/share/german/errmsg.txt6
-rw-r--r--sql/share/greek/errmsg.txt6
-rw-r--r--sql/share/hungarian/errmsg.txt6
-rw-r--r--sql/share/italian/errmsg.txt6
-rw-r--r--sql/share/japanese/errmsg.txt6
-rw-r--r--sql/share/korean/errmsg.txt6
-rw-r--r--sql/share/norwegian-ny/errmsg.txt6
-rw-r--r--sql/share/norwegian/errmsg.txt6
-rw-r--r--sql/share/polish/errmsg.txt6
-rw-r--r--sql/share/portuguese/errmsg.txt6
-rw-r--r--sql/share/romanian/errmsg.txt6
-rw-r--r--sql/share/russian/errmsg.txt6
-rw-r--r--sql/share/serbian/errmsg.txt6
-rw-r--r--sql/share/slovak/errmsg.txt6
-rw-r--r--sql/share/spanish/errmsg.txt6
-rw-r--r--sql/share/swedish/errmsg.txt6
-rw-r--r--sql/share/ukrainian/errmsg.txt6
23 files changed, 116 insertions, 23 deletions
diff --git a/sql/share/czech/errmsg.txt b/sql/share/czech/errmsg.txt
index 6c3196bfeba..d56f043b78f 100644
--- a/sql/share/czech/errmsg.txt
+++ b/sql/share/czech/errmsg.txt
@@ -259,4 +259,8 @@ v/*
"Every derived table must have it's own alias"
"Select %u was reduced during optimisation",
"Table '%-.64s' from one of SELECT's can not be used in %-.32s"
-"Client does not support authentication protocol requested by server. Consider upgrading MySQL client" \ No newline at end of file
+"Client does not support authentication protocol requested by server. Consider upgrading MySQL client"
+"Can't create a PROCEDURE from within a PROCEDURE"
+"PROCEDURE already exists"
+"PROCEDURE does not exist"
+"Failed to DROP PROCEDURE"
diff --git a/sql/share/danish/errmsg.txt b/sql/share/danish/errmsg.txt
index dcc016511dd..9eea7e96e90 100644
--- a/sql/share/danish/errmsg.txt
+++ b/sql/share/danish/errmsg.txt
@@ -253,4 +253,8 @@
"Every derived table must have it's own alias"
"Select %u was reduced during optimisation",
"Table '%-.64s' from one of SELECT's can not be used in %-.32s"
-"Client does not support authentication protocol requested by server. Consider upgrading MySQL client" \ No newline at end of file
+"Client does not support authentication protocol requested by server. Consider upgrading MySQL client"
+"Can't create a PROCEDURE from within a PROCEDURE"
+"PROCEDURE already exists"
+"PROCEDURE does not exist"
+"Failed to DROP PROCEDURE"
diff --git a/sql/share/dutch/errmsg.txt b/sql/share/dutch/errmsg.txt
index 6091616fc4a..8ae5806594a 100644
--- a/sql/share/dutch/errmsg.txt
+++ b/sql/share/dutch/errmsg.txt
@@ -261,4 +261,8 @@
"Every derived table must have it's own alias"
"Select %u was reduced during optimisation",
"Table '%-.64s' from one of SELECT's can not be used in %-.32s"
-"Client does not support authentication protocol requested by server. Consider upgrading MySQL client" \ No newline at end of file
+"Client does not support authentication protocol requested by server. Consider upgrading MySQL client"
+"Can't create a PROCEDURE from within a PROCEDURE"
+"PROCEDURE already exists"
+"PROCEDURE does not exist"
+"Failed to DROP PROCEDURE"
diff --git a/sql/share/english/errmsg.txt b/sql/share/english/errmsg.txt
index 465992e63b2..76acfc558ff 100644
--- a/sql/share/english/errmsg.txt
+++ b/sql/share/english/errmsg.txt
@@ -250,4 +250,9 @@
"Every derived table must have it's own alias",
"Select %u was reduced during optimisation",
"Table '%-.64s' from one of SELECT's can not be used in %-.32s"
-"Client does not support authentication protocol requested by server. Consider upgrading MySQL client" \ No newline at end of file
+"Client does not support authentication protocol requested by server. Consider upgrading MySQL client"
+"Can't create a PROCEDURE from within a PROCEDURE"
+"PROCEDURE already exists"
+"PROCEDURE does not exist"
+"Failed to DROP PROCEDURE"
+"Failed to store PROCEDURE"
diff --git a/sql/share/estonian/errmsg.txt b/sql/share/estonian/errmsg.txt
index 43eb5de89a5..5caa6e8206c 100644
--- a/sql/share/estonian/errmsg.txt
+++ b/sql/share/estonian/errmsg.txt
@@ -255,4 +255,8 @@
"Every derived table must have it's own alias"
"Select %u was reduced during optimisation",
"Table '%-.64s' from one of SELECT's can not be used in %-.32s"
-"Client does not support authentication protocol requested by server. Consider upgrading MySQL client" \ No newline at end of file
+"Client does not support authentication protocol requested by server. Consider upgrading MySQL client"
+"Can't create a PROCEDURE from within a PROCEDURE"
+"PROCEDURE already exists"
+"PROCEDURE does not exist"
+"Failed to DROP PROCEDURE"
diff --git a/sql/share/french/errmsg.txt b/sql/share/french/errmsg.txt
index d7bb19c2876..eb5c147b35a 100644
--- a/sql/share/french/errmsg.txt
+++ b/sql/share/french/errmsg.txt
@@ -250,4 +250,8 @@
"Every derived table must have it's own alias"
"Select %u was reduced during optimisation",
"Table '%-.64s' from one of SELECT's can not be used in %-.32s"
-"Client does not support authentication protocol requested by server. Consider upgrading MySQL client" \ No newline at end of file
+"Client does not support authentication protocol requested by server. Consider upgrading MySQL client"
+"Can't create a PROCEDURE from within a PROCEDURE"
+"PROCEDURE already exists"
+"PROCEDURE does not exist"
+"Failed to DROP PROCEDURE"
diff --git a/sql/share/german/errmsg.txt b/sql/share/german/errmsg.txt
index 765fbd875e2..a13e2988335 100644
--- a/sql/share/german/errmsg.txt
+++ b/sql/share/german/errmsg.txt
@@ -260,4 +260,8 @@
"FЭr jede abgeleitete Tabelle muss ein eigener Alias angegeben werden.",
"Select %u wurde wДhrend der Optimierung reduziert.",
"Tabelle '%-.64s', die in einem der SELECT-Befehle verwendet wurde kann nicht in %-.32s verwendet werden."
-"Client does not support authentication protocol requested by server. Consider upgrading MySQL client" \ No newline at end of file
+"Client does not support authentication protocol requested by server. Consider upgrading MySQL client"
+"Can't create a PROCEDURE from within a PROCEDURE"
+"PROCEDURE already exists"
+"PROCEDURE does not exist"
+"Failed to DROP PROCEDURE"
diff --git a/sql/share/greek/errmsg.txt b/sql/share/greek/errmsg.txt
index 8831d4e47b9..c71559ba363 100644
--- a/sql/share/greek/errmsg.txt
+++ b/sql/share/greek/errmsg.txt
@@ -250,4 +250,8 @@
"Every derived table must have it's own alias"
"Select %u was reduced during optimisation",
"Table '%-.64s' from one of SELECT's can not be used in %-.32s"
-"Client does not support authentication protocol requested by server. Consider upgrading MySQL client" \ No newline at end of file
+"Client does not support authentication protocol requested by server. Consider upgrading MySQL client"
+"Can't create a PROCEDURE from within a PROCEDURE"
+"PROCEDURE already exists"
+"PROCEDURE does not exist"
+"Failed to DROP PROCEDURE"
diff --git a/sql/share/hungarian/errmsg.txt b/sql/share/hungarian/errmsg.txt
index 8d6c321d316..0a570ea4879 100644
--- a/sql/share/hungarian/errmsg.txt
+++ b/sql/share/hungarian/errmsg.txt
@@ -252,4 +252,8 @@
"Every derived table must have it's own alias"
"Select %u was reduced during optimisation",
"Table '%-.64s' from one of SELECT's can not be used in %-.32s"
-"Client does not support authentication protocol requested by server. Consider upgrading MySQL client" \ No newline at end of file
+"Client does not support authentication protocol requested by server. Consider upgrading MySQL client"
+"Can't create a PROCEDURE from within a PROCEDURE"
+"PROCEDURE already exists"
+"PROCEDURE does not exist"
+"Failed to DROP PROCEDURE"
diff --git a/sql/share/italian/errmsg.txt b/sql/share/italian/errmsg.txt
index 451ad3e058b..9a1f7bd5e7f 100644
--- a/sql/share/italian/errmsg.txt
+++ b/sql/share/italian/errmsg.txt
@@ -250,4 +250,8 @@
"Every derived table must have it's own alias"
"Select %u was reduced during optimisation",
"Table '%-.64s' from one of SELECT's can not be used in %-.32s"
-"Client does not support authentication protocol requested by server. Consider upgrading MySQL client" \ No newline at end of file
+"Client does not support authentication protocol requested by server. Consider upgrading MySQL client"
+"Can't create a PROCEDURE from within a PROCEDURE"
+"PROCEDURE already exists"
+"PROCEDURE does not exist"
+"Failed to DROP PROCEDURE"
diff --git a/sql/share/japanese/errmsg.txt b/sql/share/japanese/errmsg.txt
index 70ab2d6d42d..d110d9a766a 100644
--- a/sql/share/japanese/errmsg.txt
+++ b/sql/share/japanese/errmsg.txt
@@ -252,4 +252,8 @@
"Every derived table must have it's own alias"
"Select %u was reduced during optimisation",
"Table '%-.64s' from one of SELECT's can not be used in %-.32s"
-"Client does not support authentication protocol requested by server. Consider upgrading MySQL client" \ No newline at end of file
+"Client does not support authentication protocol requested by server. Consider upgrading MySQL client"
+"Can't create a PROCEDURE from within a PROCEDURE"
+"PROCEDURE already exists"
+"PROCEDURE does not exist"
+"Failed to DROP PROCEDURE"
diff --git a/sql/share/korean/errmsg.txt b/sql/share/korean/errmsg.txt
index c18c3ed3873..896f359a30a 100644
--- a/sql/share/korean/errmsg.txt
+++ b/sql/share/korean/errmsg.txt
@@ -250,4 +250,8 @@
"Every derived table must have it's own alias"
"Select %u was reduced during optimisation",
"Table '%-.64s' from one of SELECT's can not be used in %-.32s"
-"Client does not support authentication protocol requested by server. Consider upgrading MySQL client" \ No newline at end of file
+"Client does not support authentication protocol requested by server. Consider upgrading MySQL client"
+"Can't create a PROCEDURE from within a PROCEDURE"
+"PROCEDURE already exists"
+"PROCEDURE does not exist"
+"Failed to DROP PROCEDURE"
diff --git a/sql/share/norwegian-ny/errmsg.txt b/sql/share/norwegian-ny/errmsg.txt
index 9cd99613f52..d2f6c4816c2 100644
--- a/sql/share/norwegian-ny/errmsg.txt
+++ b/sql/share/norwegian-ny/errmsg.txt
@@ -252,4 +252,8 @@
"Every derived table must have it's own alias"
"Select %u was reduced during optimisation",
"Table '%-.64s' from one of SELECT's can not be used in %-.32s"
-"Client does not support authentication protocol requested by server. Consider upgrading MySQL client" \ No newline at end of file
+"Client does not support authentication protocol requested by server. Consider upgrading MySQL client"
+"Can't create a PROCEDURE from within a PROCEDURE"
+"PROCEDURE already exists"
+"PROCEDURE does not exist"
+"Failed to DROP PROCEDURE"
diff --git a/sql/share/norwegian/errmsg.txt b/sql/share/norwegian/errmsg.txt
index 32fe6c30b34..7132e49b00b 100644
--- a/sql/share/norwegian/errmsg.txt
+++ b/sql/share/norwegian/errmsg.txt
@@ -252,4 +252,8 @@
"Every derived table must have it's own alias"
"Select %u was reduced during optimisation",
"Table '%-.64s' from one of SELECT's can not be used in %-.32s"
-"Client does not support authentication protocol requested by server. Consider upgrading MySQL client" \ No newline at end of file
+"Client does not support authentication protocol requested by server. Consider upgrading MySQL client"
+"Can't create a PROCEDURE from within a PROCEDURE"
+"PROCEDURE already exists"
+"PROCEDURE does not exist"
+"Failed to DROP PROCEDURE"
diff --git a/sql/share/polish/errmsg.txt b/sql/share/polish/errmsg.txt
index 4b59a62f991..f7657e67dfa 100644
--- a/sql/share/polish/errmsg.txt
+++ b/sql/share/polish/errmsg.txt
@@ -254,4 +254,8 @@
"Every derived table must have it's own alias"
"Select %u was reduced during optimisation",
"Table '%-.64s' from one of SELECT's can not be used in %-.32s"
-"Client does not support authentication protocol requested by server. Consider upgrading MySQL client" \ No newline at end of file
+"Client does not support authentication protocol requested by server. Consider upgrading MySQL client"
+"Can't create a PROCEDURE from within a PROCEDURE"
+"PROCEDURE already exists"
+"PROCEDURE does not exist"
+"Failed to DROP PROCEDURE"
diff --git a/sql/share/portuguese/errmsg.txt b/sql/share/portuguese/errmsg.txt
index 7236bd86652..8b7d9c76d14 100644
--- a/sql/share/portuguese/errmsg.txt
+++ b/sql/share/portuguese/errmsg.txt
@@ -250,4 +250,8 @@
"Every derived table must have it's own alias"
"Select %u was reduced during optimisation",
"Table '%-.64s' from one of SELECT's can not be used in %-.32s"
-"Client does not support authentication protocol requested by server. Consider upgrading MySQL client" \ No newline at end of file
+"Client does not support authentication protocol requested by server. Consider upgrading MySQL client"
+"Can't create a PROCEDURE from within a PROCEDURE"
+"PROCEDURE already exists"
+"PROCEDURE does not exist"
+"Failed to DROP PROCEDURE"
diff --git a/sql/share/romanian/errmsg.txt b/sql/share/romanian/errmsg.txt
index 0b8bbe1c219..4bd79d1b905 100644
--- a/sql/share/romanian/errmsg.txt
+++ b/sql/share/romanian/errmsg.txt
@@ -254,4 +254,8 @@
"Every derived table must have it's own alias"
"Select %u was reduced during optimisation",
"Table '%-.64s' from one of SELECT's can not be used in %-.32s"
-"Client does not support authentication protocol requested by server. Consider upgrading MySQL client" \ No newline at end of file
+"Client does not support authentication protocol requested by server. Consider upgrading MySQL client"
+"Can't create a PROCEDURE from within a PROCEDURE"
+"PROCEDURE already exists"
+"PROCEDURE does not exist"
+"Failed to DROP PROCEDURE"
diff --git a/sql/share/russian/errmsg.txt b/sql/share/russian/errmsg.txt
index 2f1eedd207c..dd941428dfc 100644
--- a/sql/share/russian/errmsg.txt
+++ b/sql/share/russian/errmsg.txt
@@ -253,4 +253,8 @@
"Every derived table must have it's own alias"
"Select %u был упразднен в процессе оптимизации",
"Table '%-.64s' from one of SELECT's can not be used in %-.32s"
-"Client does not support authentication protocol requested by server. Consider upgrading MySQL client" \ No newline at end of file
+"Client does not support authentication protocol requested by server. Consider upgrading MySQL client"
+"Can't create a PROCEDURE from within a PROCEDURE"
+"PROCEDURE already exists"
+"PROCEDURE does not exist"
+"Failed to DROP PROCEDURE"
diff --git a/sql/share/serbian/errmsg.txt b/sql/share/serbian/errmsg.txt
index 75cfd73f3f0..8739f7bfa34 100644
--- a/sql/share/serbian/errmsg.txt
+++ b/sql/share/serbian/errmsg.txt
@@ -246,4 +246,8 @@
"Every derived table must have it's own alias"
"Select %u was reduced during optimisation",
"Table '%-.64s' from one of SELECT's can not be used in %-.32s"
-"Client does not support authentication protocol requested by server. Consider upgrading MySQL client" \ No newline at end of file
+"Client does not support authentication protocol requested by server. Consider upgrading MySQL client"
+"Can't create a PROCEDURE from within a PROCEDURE"
+"PROCEDURE already exists"
+"PROCEDURE does not exist"
+"Failed to DROP PROCEDURE"
diff --git a/sql/share/slovak/errmsg.txt b/sql/share/slovak/errmsg.txt
index de354f234c7..212ea72c727 100644
--- a/sql/share/slovak/errmsg.txt
+++ b/sql/share/slovak/errmsg.txt
@@ -258,4 +258,8 @@
"Every derived table must have it's own alias"
"Select %u was reduced during optimisation",
"Table '%-.64s' from one of SELECT's can not be used in %-.32s"
-"Client does not support authentication protocol requested by server. Consider upgrading MySQL client" \ No newline at end of file
+"Client does not support authentication protocol requested by server. Consider upgrading MySQL client"
+"Can't create a PROCEDURE from within a PROCEDURE"
+"PROCEDURE already exists"
+"PROCEDURE does not exist"
+"Failed to DROP PROCEDURE"
diff --git a/sql/share/spanish/errmsg.txt b/sql/share/spanish/errmsg.txt
index a528c3e6b36..87934beb754 100644
--- a/sql/share/spanish/errmsg.txt
+++ b/sql/share/spanish/errmsg.txt
@@ -251,4 +251,8 @@
"Every derived table must have it's own alias"
"Select %u was reduced during optimisation",
"Table '%-.64s' from one of SELECT's can not be used in %-.32s"
-"Client does not support authentication protocol requested by server. Consider upgrading MySQL client" \ No newline at end of file
+"Client does not support authentication protocol requested by server. Consider upgrading MySQL client"
+"Can't create a PROCEDURE from within a PROCEDURE"
+"PROCEDURE already exists"
+"PROCEDURE does not exist"
+"Failed to DROP PROCEDURE"
diff --git a/sql/share/swedish/errmsg.txt b/sql/share/swedish/errmsg.txt
index 5473f4e8e42..c4964688102 100644
--- a/sql/share/swedish/errmsg.txt
+++ b/sql/share/swedish/errmsg.txt
@@ -250,4 +250,8 @@
"Every derived table must have it's own alias"
"Select %u was reduced during optimisation",
"Table '%-.64s' from one of SELECT's can not be used in %-.32s"
-"Client does not support authentication protocol requested by server. Consider upgrading MySQL client" \ No newline at end of file
+"Client does not support authentication protocol requested by server. Consider upgrading MySQL client"
+"Can't create a PROCEDURE from within a PROCEDURE"
+"PROCEDURE already exists"
+"PROCEDURE does not exist"
+"Failed to DROP PROCEDURE"
diff --git a/sql/share/ukrainian/errmsg.txt b/sql/share/ukrainian/errmsg.txt
index 0b91786d1f3..0d8f89ac431 100644
--- a/sql/share/ukrainian/errmsg.txt
+++ b/sql/share/ukrainian/errmsg.txt
@@ -255,4 +255,8 @@
"Every derived table must have it's own alias"
"Select %u was скасовано при оптимiзацii",
"Table '%-.64s' from one of SELECT's can not be used in %-.32s"
-"Client does not support authentication protocol requested by server. Consider upgrading MySQL client" \ No newline at end of file
+"Client does not support authentication protocol requested by server. Consider upgrading MySQL client"
+"Can't create a PROCEDURE from within a PROCEDURE"
+"PROCEDURE already exists"
+"PROCEDURE does not exist"
+"Failed to DROP PROCEDURE"