summaryrefslogtreecommitdiff
path: root/sql/ha_partition.h
diff options
context:
space:
mode:
authorunknown <mikael@dator5.(none)>2006-07-01 00:01:37 -0400
committerunknown <mikael@dator5.(none)>2006-07-01 00:01:37 -0400
commitc92b025b3a98f02b26678cfd14dba2d169f980c8 (patch)
treea9af6bfab0bb1fa096598be7a003fe272b362d5c /sql/ha_partition.h
parentbf723783a786c70f63f87fd6b2c5b0146f6a7183 (diff)
downloadmariadb-git-c92b025b3a98f02b26678cfd14dba2d169f980c8.tar.gz
BUG#17138: Crashes in stored procedure
Last round of review fixes BUILD/compile-pentium-gcov: No change sql/ha_ndbcluster.h: Last round of review changes sql/ha_partition.h: Last round of review changes sql/handler.h: Last round of review changes sql/item_sum.cc: Last round of review changes sql/sql_acl.cc: Last round of review changes sql/sql_insert.cc: Last round of review changes sql/sql_select.cc: Last round of review changes sql/sql_table.cc: Last round of review changes sql/sql_union.cc: Last round of review changes sql/sql_update.cc: Last round of review changes
Diffstat (limited to 'sql/ha_partition.h')
-rw-r--r--sql/ha_partition.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/ha_partition.h b/sql/ha_partition.h
index 4b85ddd2def..4c627cd50f8 100644
--- a/sql/ha_partition.h
+++ b/sql/ha_partition.h
@@ -304,9 +304,8 @@ public:
virtual bool is_fatal_error(int error, uint flags)
{
- if (!handler::is_fatal_error(error, flags))
- return FALSE;
- if (error == HA_ERR_NO_PARTITION_FOUND)
+ if (!handler::is_fatal_error(error, flags) ||
+ error == HA_ERR_NO_PARTITION_FOUND)
return FALSE;
return TRUE;
}