diff options
| author | unknown <mikael@dator5.(none)> | 2006-06-20 16:52:40 -0400 |
|---|---|---|
| committer | unknown <mikael@dator5.(none)> | 2006-06-20 16:52:40 -0400 |
| commit | 897810e961d9b9a3916332fee878369f703c38c7 (patch) | |
| tree | d43f6fb2c0aaaf7ae238d1e51a722360cfd04522 /sql/item_sum.cc | |
| parent | a70567c1cf53564acfc66e0c7d96203aa93d31fa (diff) | |
| download | mariadb-git-897810e961d9b9a3916332fee878369f703c38c7.tar.gz | |
BUG#17138: Crash in stored procedure after fatal error that wasn't a real fatal error
sql/handler.h:
Handle HA_ERR_FOUND_DUPP_KEY and HA_ERR_FOUND_DUPP_UNIQUE similarly
sql/item_sum.cc:
fix
sql/sql_select.cc:
fix
Diffstat (limited to 'sql/item_sum.cc')
| -rw-r--r-- | sql/item_sum.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/item_sum.cc b/sql/item_sum.cc index d6bc2c326d6..ff37ceaa6fe 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -2663,8 +2663,7 @@ bool Item_sum_count_distinct::add() return tree->unique_add(table->record[0] + table->s->null_bytes); } if ((error= table->file->ha_write_row(table->record[0])) && - error != HA_ERR_FOUND_DUPP_KEY && - error != HA_ERR_FOUND_DUPP_UNIQUE) + table->file->cannot_ignore_error(error, HA_CHECK_DUPP)) return TRUE; return FALSE; } |