diff options
| author | Mattias Jonsson <mattias.jonsson@sun.com> | 2009-02-20 16:56:32 +0100 |
|---|---|---|
| committer | Mattias Jonsson <mattias.jonsson@sun.com> | 2009-02-20 16:56:32 +0100 |
| commit | e7e5443a01aae834224eeff8c1b4afa8cf85117a (patch) | |
| tree | b56c538b8da293b0c9138fc83fe7705a7b095017 /sql/ha_partition.cc | |
| parent | 9eaa51099ca56b16e96789f74e90e7c15d291466 (diff) | |
| download | mariadb-git-e7e5443a01aae834224eeff8c1b4afa8cf85117a.tar.gz | |
Backport of patch for bug#40003 from 6.0 to 5.1,
related to the backport of the patch for bug#38719
sql/ha_partition.cc:
bug#40003, archive does not handle dup_key.
Diffstat (limited to 'sql/ha_partition.cc')
| -rw-r--r-- | sql/ha_partition.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/ha_partition.cc b/sql/ha_partition.cc index 0e36a868b3e..67bc3156260 100644 --- a/sql/ha_partition.cc +++ b/sql/ha_partition.cc @@ -4928,10 +4928,11 @@ int ha_partition::info(uint flag) This flag is used to get index number of the unique index that reported duplicate key We will report the errkey on the last handler used and ignore the rest + Note: all engines does not support HA_STATUS_ERRKEY, so set errkey. */ + file->errkey= errkey; file->info(HA_STATUS_ERRKEY); - if (file->errkey != (uint) -1) - errkey= file->errkey; + errkey= file->errkey; } if (flag & HA_STATUS_TIME) { |