database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Backport of patch for bug#40003 from 6.0 to 5.1,

Browse Source 
related to the backport of the patch for bug#38719
This commit is contained in:
Mattias Jonsson
2009-02-20 16:56:32 +01:00
parent 44c8379e55
commit a316631af4
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/t/innodb_bug42419.test
View File

@ -3,6 +3,7 @@
# Bug#42419 Server crash with "Pure virtual method called" on two concurrent connections # Bug#42419 Server crash with "Pure virtual method called" on two concurrent connections
# #
--source include/not_embedded.inc
--source include/have_innodb.inc --source include/have_innodb.inc
let $innodb_lock_wait_timeout= query_get_value(SHOW VARIABLES LIKE 'innodb_lock_wait_timeout%', Value, 1); let $innodb_lock_wait_timeout= query_get_value(SHOW VARIABLES LIKE 'innodb_lock_wait_timeout%', Value, 1);

5
sql/ha_partition.cc
View File

@ -4928,10 +4928,11 @@ int ha_partition::info(uint flag)
This flag is used to get index number of the unique index that This flag is used to get index number of the unique index that
reported duplicate key reported duplicate key
We will report the errkey on the last handler used and ignore the rest 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); file->info(HA_STATUS_ERRKEY);
if (file->errkey != (uint) -1) errkey= file->errkey;
errkey= file->errkey;
} }
if (flag & HA_STATUS_TIME) if (flag & HA_STATUS_TIME)
{ {