diff options
| author | unknown <pem@mysql.com> | 2005-10-26 15:34:57 +0200 |
|---|---|---|
| committer | unknown <pem@mysql.com> | 2005-10-26 15:34:57 +0200 |
| commit | 9349f18b4491b55d8edc4a314131bd44108278ad (patch) | |
| tree | 8438f02a4a9ed206e60f26923143418163c0ba22 /sql/sql_trigger.h | |
| parent | 10a889a577e1a09f29922ba20d7e8ad96449bb04 (diff) | |
| download | mariadb-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/sql_trigger.h')
| -rw-r--r-- | sql/sql_trigger.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_trigger.h b/sql/sql_trigger.h index c1d1f8d0e9e..f50624767be 100644 --- a/sql/sql_trigger.h +++ b/sql/sql_trigger.h @@ -101,7 +101,7 @@ public: void set_table(TABLE *new_table); friend class Item_trigger_field; - friend void sp_cache_routines_and_add_tables_for_triggers(THD *thd, LEX *lex, + friend int sp_cache_routines_and_add_tables_for_triggers(THD *thd, LEX *lex, Table_triggers_list *triggers); private: |