diff options
| author | Mattias Jonsson <mattias.jonsson@sun.com> | 2009-02-20 17:02:02 +0100 |
|---|---|---|
| committer | Mattias Jonsson <mattias.jonsson@sun.com> | 2009-02-20 17:02:02 +0100 |
| commit | 9b36597ac1836020d875538b891cc7ebbcbbd305 (patch) | |
| tree | 8563d6f22aac569d607f9e7ce0f9820d29747849 | |
| parent | 11a206a37c78d7c02eeb0e6634c1b405cbae5b76 (diff) | |
| parent | e7e5443a01aae834224eeff8c1b4afa8cf85117a (diff) | |
| download | mariadb-git-9b36597ac1836020d875538b891cc7ebbcbbd305.tar.gz | |
merge
| -rw-r--r-- | mysql-test/t/innodb_bug42419.test | 1 | ||||
| -rw-r--r-- | sql/ha_partition.cc | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/mysql-test/t/innodb_bug42419.test b/mysql-test/t/innodb_bug42419.test index 389093a8465..93c4764252a 100644 --- a/mysql-test/t/innodb_bug42419.test +++ b/mysql-test/t/innodb_bug42419.test @@ -3,6 +3,7 @@ # Bug#42419 Server crash with "Pure virtual method called" on two concurrent connections # +--source include/not_embedded.inc --source include/have_innodb.inc let $innodb_lock_wait_timeout= query_get_value(SHOW VARIABLES LIKE 'innodb_lock_wait_timeout%', Value, 1); 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) { |