diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-05-10 18:17:43 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-05-10 18:17:43 +0300 |
| commit | f34be1893892745b5b1a7a099eab4ad8e9ac8641 (patch) | |
| tree | d7eed818fd8b648e5eabe0dbad53e61665d8dc37 /sql/sql_union.cc | |
| parent | e843297d128b165125d17aab8958f7ca91808923 (diff) | |
| parent | 8882d71f3f1dd03ef98d072def39b29e6a03f5b8 (diff) | |
| download | mariadb-git-f34be1893892745b5b1a7a099eab4ad8e9ac8641.tar.gz | |
Merge with MariaDB 5.2
Diffstat (limited to 'sql/sql_union.cc')
| -rw-r--r-- | sql/sql_union.cc | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/sql/sql_union.cc b/sql/sql_union.cc index a94ad9f3b4b..898df3dd65e 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -49,7 +49,7 @@ int select_union::prepare(List<Item> &list, SELECT_LEX_UNIT *u) } -bool select_union::send_data(List<Item> &values) +int select_union::send_data(List<Item> &values) { if (unit->offset_limit_cnt) { // using limit offset,count @@ -62,6 +62,14 @@ bool select_union::send_data(List<Item> &values) if ((write_err= table->file->ha_write_row(table->record[0]))) { + if (write_err == HA_ERR_FOUND_DUPP_KEY) + { + /* + Inform upper level that we found a duplicate key, that should not + be counted as part of limit + */ + return -1; + } /* create_internal_tmp_table_from_heap will generate error if needed */ if (table->file->is_fatal_error(write_err, HA_CHECK_DUP) && create_internal_tmp_table_from_heap(thd, table, |