diff options
| author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2009-11-19 21:48:08 -0200 |
|---|---|---|
| committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2009-11-19 21:48:08 -0200 |
| commit | 5aeeaaf507ac87f6ff56806fe8a356cea7d4a48f (patch) | |
| tree | d21225ac09b301f317ca89093128769a5ede9fbb /sql/ha_partition.cc | |
| parent | 780871d8b90fe3146db39b4be65ebedb309b9f9b (diff) | |
| parent | 5128b54c38ae183d18a29e00b318c22046445715 (diff) | |
| download | mariadb-git-5aeeaaf507ac87f6ff56806fe8a356cea7d4a48f.tar.gz | |
Manual merge of mysql-next-mr-runtime upstream.
Diffstat (limited to 'sql/ha_partition.cc')
| -rw-r--r-- | sql/ha_partition.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/ha_partition.cc b/sql/ha_partition.cc index 7e5eccb2374..0d5fc454a0c 100644 --- a/sql/ha_partition.cc +++ b/sql/ha_partition.cc @@ -1980,8 +1980,7 @@ partition_element *ha_partition::find_partition_element(uint part_id) return part_elem; } DBUG_ASSERT(0); - my_error(ER_OUT_OF_RESOURCES, MYF(0)); - current_thd->fatal_error(); // Abort + my_error(ER_OUT_OF_RESOURCES, MYF(ME_FATALERROR)); return NULL; } |