diff options
| author | unknown <mikael@dator5.(none)> | 2006-06-20 16:59:51 -0400 |
|---|---|---|
| committer | unknown <mikael@dator5.(none)> | 2006-06-20 16:59:51 -0400 |
| commit | 9fc2ade279e8feca054262256fe2747e28860b04 (patch) | |
| tree | 3273e9a3d3572e9a2423cf7d98f4cd65aa5b5b06 /sql/sql_union.cc | |
| parent | 89fc7fdb056fc8aa5ffb5da229b460e9863f0641 (diff) | |
| parent | 897810e961d9b9a3916332fee878369f703c38c7 (diff) | |
| download | mariadb-git-9fc2ade279e8feca054262256fe2747e28860b04.tar.gz | |
Merge dator5.(none):/home/pappa/clean-mysql-5.1
into dator5.(none):/home/pappa/bug17138
sql/sql_update.cc:
Auto merged
Diffstat (limited to 'sql/sql_union.cc')
| -rw-r--r-- | sql/sql_union.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_union.cc b/sql/sql_union.cc index bf93f0d3bea..5ad5ecc6556 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -65,7 +65,7 @@ bool select_union::send_data(List<Item> &values) if ((error= table->file->ha_write_row(table->record[0]))) { /* create_myisam_from_heap will generate error if needed */ - if (error != HA_ERR_FOUND_DUPP_KEY && error != HA_ERR_FOUND_DUPP_UNIQUE && + if (table->file->cannot_ignore_error(error, HA_CHECK_DUPP) && create_myisam_from_heap(thd, table, &tmp_table_param, error, 1)) return 1; } |