summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <heikki@hundin.mysql.fi>2004-09-01 16:41:09 +0300
committerunknown <heikki@hundin.mysql.fi>2004-09-01 16:41:09 +0300
commit06959e0e66ab4640e9e7eea3354c8888ae7acc73 (patch)
tree4c444a9cc8ac9d177fad3f170947449f32ca55ed
parent8133ce04f8bafc36c6280c4b76ddd9d4b34b861a (diff)
downloadmariadb-git-06959e0e66ab4640e9e7eea3354c8888ae7acc73.tar.gz
ha_innodb.cc:
If ALTER TABLE ... DROP FOREIGN KEY ... fails because of a wrong constraint name, return a table handler error number 150 instead of 152; the value 152 was misleading, as it referred to '152 = Cannot delete a parent row', whereas '150 = Foreign key constraint is incorrectly formed' is less misleading sql/ha_innodb.cc: If ALTER TABLE ... DROP FOREIGN KEY ... fails because of a wrong constraint name, return a table handler error number 150 instead of 152; the value 152 was misleading, as it referred to '152 = Cannot delete a parent row', whereas '150 = Foreign key constraint is incorrectly formed' is less misleading
-rw-r--r--sql/ha_innodb.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc
index 3d3aca9cfd5..1572e22d6f7 100644
--- a/sql/ha_innodb.cc
+++ b/sql/ha_innodb.cc
@@ -285,8 +285,9 @@ convert_error_code_to_mysql(
} else if (error == (int) DB_CANNOT_DROP_CONSTRAINT) {
- return(HA_ERR_ROW_IS_REFERENCED);
-
+ return(HA_ERR_CANNOT_ADD_FOREIGN); /* TODO: This is a bit
+ misleading, a new MySQL error
+ code should be introduced */
} else if (error == (int) DB_COL_APPEARS_TWICE_IN_INDEX) {
return(HA_ERR_CRASHED);