summaryrefslogtreecommitdiff
path: root/sql/share
diff options
context:
space:
mode:
authorunknown <pem@mysql.com>2005-10-26 15:34:57 +0200
committerunknown <pem@mysql.com>2005-10-26 15:34:57 +0200
commit9349f18b4491b55d8edc4a314131bd44108278ad (patch)
tree8438f02a4a9ed206e60f26923143418163c0ba22 /sql/share
parent10a889a577e1a09f29922ba20d7e8ad96449bb04 (diff)
downloadmariadb-git-9349f18b4491b55d8edc4a314131bd44108278ad.tar.gz
Fixed BUG#14233: Crash after tampering with the mysql.proc table
Added error checking for errors when attempting to use stored procedures after the mysql.proc table has been dropped, corrupted, or tampered with. Test cases were put in a separate file (sp-destruct.test). mysql-test/t/sp.test: Added comment. sql/share/errmsg.txt: New error message for corrupted mysql.proc table. sql/sp.cc: Check and return error code when caching stored routines. In the case when no error message has been set, set one. sql/sp.h: Return error code from stored routine cache function. sql/sql_base.cc: Check for error from sp_cache_routines_* calls. sql/sql_trigger.h: Updated friend declaration for sp_cache_routines*. mysql-test/r/sp-destruct.result: New test file for destruction of the mysql.proc table. mysql-test/t/sp-destruct.test: New result file for destruction of the mysql.proc table.
Diffstat (limited to 'sql/share')
-rw-r--r--sql/share/errmsg.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt
index ccf11248a1f..141fd46d464 100644
--- a/sql/share/errmsg.txt
+++ b/sql/share/errmsg.txt
@@ -5422,3 +5422,5 @@ ER_NO_REFERENCED_ROW_2 23000
eng "Cannot add or update a child row: a foreign key constraint fails (%.192s)"
ER_SP_BAD_VAR_SHADOW 42000
eng "Variable '%-.64s' must be quoted with `...`, or renamed"
+ER_SP_PROC_TABLE_CORRUPT
+ eng "The table mysql.proc is missing, corrupt, or contains bad data (internal code %d)"