summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <lenz@mysql.com>2004-01-15 12:09:23 +0100
committerunknown <lenz@mysql.com>2004-01-15 12:09:23 +0100
commitb3e6fb8bea7523a78541faaeef0b7fe561c2009e (patch)
treef23201da69bb6a72f19a08bd080ed85656691d52
parent91c236cc77df2886e6a1b26c41f54a71ff58c8b4 (diff)
parentd7c2c8f1f998cfff2ee39ce5aaa0a17920898ecf (diff)
downloadmariadb-git-b3e6fb8bea7523a78541faaeef0b7fe561c2009e.tar.gz
Merge mysql.com:/space/my/mysql-4.0
into mysql.com:/space/my/mysql-4.0-build
-rw-r--r--innobase/row/row0ins.c16
1 files changed, 0 insertions, 16 deletions
diff --git a/innobase/row/row0ins.c b/innobase/row/row0ins.c
index 45c5897eee7..d589cc8c9bc 100644
--- a/innobase/row/row0ins.c
+++ b/innobase/row/row0ins.c
@@ -682,14 +682,6 @@ row_ins_foreign_check_on_constraint(
(DICT_FOREIGN_ON_DELETE_CASCADE
| DICT_FOREIGN_ON_DELETE_SET_NULL))) {
- /* No action is defined: return a foreign key error if
- NO ACTION is not specified */
-
- if (foreign->type & DICT_FOREIGN_ON_DELETE_NO_ACTION) {
-
- return(DB_SUCCESS);
- }
-
row_ins_foreign_report_err((char*)"Trying to delete",
thr, foreign,
btr_pcur_get_rec(pcur), entry);
@@ -703,14 +695,6 @@ row_ins_foreign_check_on_constraint(
/* This is an UPDATE */
- /* No action is defined: return a foreign key error if
- NO ACTION is not specified */
-
- if (foreign->type & DICT_FOREIGN_ON_UPDATE_NO_ACTION) {
-
- return(DB_SUCCESS);
- }
-
row_ins_foreign_report_err((char*)"Trying to update",
thr, foreign,
btr_pcur_get_rec(pcur), entry);