diff options
| author | Jimmy Yang <jimmy.yang@oracle.com> | 2013-07-10 14:00:30 +0800 |
|---|---|---|
| committer | Jimmy Yang <jimmy.yang@oracle.com> | 2013-07-10 14:00:30 +0800 |
| commit | 5d95304c0541695b968023a359c4198fd7dc7d97 (patch) | |
| tree | 0c1eca487792bf23eaa1d82454f27183293c9e9a /storage/innobase | |
| parent | 0d71a36d46abeaec07d138e4ca449bd1be7cd146 (diff) | |
| download | mariadb-git-5d95304c0541695b968023a359c4198fd7dc7d97.tar.gz | |
Fix Bug #16710923 - FALSE REPORTS OF DB_FOREIGN_EXCEED_MAX_CASCADE
rb://2582 approved by Inaam
Diffstat (limited to 'storage/innobase')
| -rw-r--r-- | storage/innobase/handler/ha_innodb.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index 163c89d6cc5..cd6ef0adb5a 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -933,7 +933,7 @@ convert_error_code_to_mysql( case DB_INTERRUPTED: my_error(ER_QUERY_INTERRUPTED, MYF(0)); - /* fall through */ + return(-1); case DB_FOREIGN_EXCEED_MAX_CASCADE: push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN, |