Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
a316631a
Commit
a316631a
authored
Feb 20, 2009
by
Mattias Jonsson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Backport of patch for bug#40003 from 6.0 to 5.1,
related to the backport of the patch for bug#38719
parent
44c8379e
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
mysql-test/t/innodb_bug42419.test
mysql-test/t/innodb_bug42419.test
+1
-0
sql/ha_partition.cc
sql/ha_partition.cc
+3
-2
No files found.
mysql-test/t/innodb_bug42419.test
View file @
a316631a
...
@@ -3,6 +3,7 @@
...
@@ -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
);
...
...
sql/ha_partition.cc
View file @
a316631a
...
@@ -4928,9 +4928,10 @@ int ha_partition::info(uint flag)
...
@@ -4928,9 +4928,10 @@ 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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment