diff options
| author | unknown <pekka@mysql.com> | 2005-09-15 14:48:49 +0200 |
|---|---|---|
| committer | unknown <pekka@mysql.com> | 2005-09-15 14:48:49 +0200 |
| commit | 6363fd57128195033dad4b4ee8d66f321e9725b4 (patch) | |
| tree | f077f1ee708dd782df143aab22e9cb5a2efb07d3 /ndb/src/kernel/blocks/dbtup | |
| parent | 6a47ca25e067cd000cac9634e7973cb5f3da878f (diff) | |
| download | mariadb-git-6363fd57128195033dad4b4ee8d66f321e9725b4.tar.gz | |
ndb - bug#9994 backpatch fixes from 5.0
IGNORE on merge 4.1->5.0
ndb/src/kernel/blocks/ERROR_codes.txt:
bug#9994 backpatch fixes from 5.0
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
bug#9994 backpatch fixes from 5.0
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
bug#9994 backpatch fixes from 5.0
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
bug#9994 backpatch fixes from 5.0
ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
bug#9994 backpatch fixes from 5.0
Diffstat (limited to 'ndb/src/kernel/blocks/dbtup')
| -rw-r--r-- | ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp b/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp index 575d08efffc..0acfd390360 100644 --- a/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp +++ b/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp @@ -305,6 +305,10 @@ Dbtup::primaryKey(Tablerec* const regTabPtr, Uint32 attrId) Uint32 Dbtup::dropTrigger(Tablerec* table, const DropTrigReq* req) { + if (ERROR_INSERTED(4004)) { + CLEAR_ERROR_INSERT_VALUE; + return 9999; + } Uint32 triggerId = req->getTriggerId(); TriggerType::Value ttype = req->getTriggerType(); |