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
820bf7b1
Commit
820bf7b1
authored
May 12, 2015
by
Ajo Robert
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bug #18075170 SQL NODE RESTART REQUIRED TO
AVOID DEADLOCK AFTER RESTORE Test Failure Fix.
parent
515b2203
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
1 deletion
+3
-1
mysql-test/r/myisam_recover.result
mysql-test/r/myisam_recover.result
+1
-1
mysql-test/t/myisam_recover.test
mysql-test/t/myisam_recover.test
+2
-0
No files found.
mysql-test/r/myisam_recover.result
View file @
820bf7b1
...
@@ -139,7 +139,7 @@ a
...
@@ -139,7 +139,7 @@ a
1
1
4
4
Warnings:
Warnings:
Error 145 Table '
./test/
t1' is marked as crashed and should be repaired
Error 145 Table 't1' is marked as crashed and should be repaired
Error 1194 Table 't1' is marked as crashed and should be repaired
Error 1194 Table 't1' is marked as crashed and should be repaired
Error 1034 Number of rows changed from 1 to 2
Error 1034 Number of rows changed from 1 to 2
ALTER TABLE t2 ADD val INT;
ALTER TABLE t2 ADD val INT;
...
...
mysql-test/t/myisam_recover.test
View file @
820bf7b1
...
@@ -124,6 +124,7 @@ connection default;
...
@@ -124,6 +124,7 @@ connection default;
--
echo
# middle of transaction, without aborting it.
--
echo
# middle of transaction, without aborting it.
connection
default
;
connection
default
;
--
let
$MYSQL_DATA_DIR
=
`select @@datadir`
create
table
t1
(
a
int
,
key
(
a
))
engine
=
myisam
;
create
table
t1
(
a
int
,
key
(
a
))
engine
=
myisam
;
create
table
t2
(
a
int
);
create
table
t2
(
a
int
);
...
@@ -150,6 +151,7 @@ select * from t2;
...
@@ -150,6 +151,7 @@ select * from t2;
--
echo
# Without fix select from t1 will break the transaction. After the fix
--
echo
# Without fix select from t1 will break the transaction. After the fix
--
echo
# transaction should be active and should hold lock on table t2. Alter
--
echo
# transaction should be active and should hold lock on table t2. Alter
--
echo
# table from con2 will wait only if the transaction is not broken.
--
echo
# table from con2 will wait only if the transaction is not broken.
--
replace_result
$MYSQL_DATA_DIR
''
./
''
test
/
''
select
*
from
t1
;
select
*
from
t1
;
connect
(
con2
,
localhost
,
root
);
connect
(
con2
,
localhost
,
root
);
...
...
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