Skip to content

M
MariaDB
Commit 981534b1 authored by Marko Mäkelä's avatar Marko Mäkelä
Browse files
Options

Remove unnecessary have_debug.inc, not_valgrind.inc 

Use include/kill_and_restart_mysqld.inc instead of triggering
DBUG_SUICIDE() with debug instrumentation. In this way, more tests
can be run with --valgrind or on non-debug servers.
parent cbdc389e
Show whitespace changes
Inline Side-by-side
Showing with 26 additions and 173 deletions
mysql-test/suite/innodb/r/innodb-32k-crash.result
View file @ 981534b1
...@@ -118,10 +118,10 @@ UPDATE t2 SET ka=@l,la=@l,ma=@l,na=@l,oa=@l,pa=@l; ...@@ -118,10 +118,10 @@ UPDATE t2 SET ka=@l,la=@l,ma=@l,na=@l,oa=@l,pa=@l;
UPDATE t2 SET qa=@l,ra=@l,sa=@l,ta=@l,ua=@l; UPDATE t2 SET qa=@l,ra=@l,sa=@l,ta=@l,ua=@l;
UPDATE t2 SET va=@l,wa=@l,xa=@l,ya=@l,za=@l; UPDATE t2 SET va=@l,wa=@l,xa=@l,ya=@l,za=@l;
COMMIT; COMMIT;
BEGIN;
INSERT INTO t1 SELECT * from t2; INSERT INTO t1 SELECT * from t2;
SET DEBUG_DBUG='+d,crash_commit_before';
UPDATE t1 SET a=@e,b=@e,c=@e,d=@e,e=@e; UPDATE t1 SET a=@e,b=@e,c=@e,d=@e,e=@e;
ERROR HY000: Lost connection to MySQL server during query # Kill and restart
UPDATE t1 SET a=@f,b=@f,c=@f,d=@f,e=@f,f=@f,g=@f,h=@f,i=@f,j=@f, UPDATE t1 SET a=@f,b=@f,c=@f,d=@f,e=@f,f=@f,g=@f,h=@f,i=@f,j=@f,
k=@f,l=@f,m=@f,n=@f,o=@f,p=@f,q=@f,r=@f,s=@f,t=@f,u=@f, k=@f,l=@f,m=@f,n=@f,o=@f,p=@f,q=@f,r=@f,s=@f,t=@f,u=@f,
v=@f,w=@f,x=@b,y=@f,z=@f, v=@f,w=@f,x=@b,y=@f,z=@f,
......
mysql-test/suite/innodb/r/innodb-64k-crash.result
View file @ 981534b1
...@@ -261,7 +261,8 @@ UPDATE t2 SET kc=@i,lc=@i,mc=@i,nc=@i,oc=@i,pc=@i; ...@@ -261,7 +261,8 @@ UPDATE t2 SET kc=@i,lc=@i,mc=@i,nc=@i,oc=@i,pc=@i;
UPDATE t2 SET qc=@i,rc=@i,sc=@i,tc=@i,uc=@i; UPDATE t2 SET qc=@i,rc=@i,sc=@i,tc=@i,uc=@i;
UPDATE t2 SET vc=@i,wc=@i,xc=@i,yc=@i,zc=@i; UPDATE t2 SET vc=@i,wc=@i,xc=@i,yc=@i,zc=@i;
COMMIT; COMMIT;
SET DEBUG_DBUG='+d,crash_commit_before'; BEGIN;
INSERT INTO t1 SELECT * from t2;
UPDATE t1 SET a=@c,b=@c,c=@c,d=@c,e=@c,f=@c,g=@c,h=@c,i=@c,j=@c, UPDATE t1 SET a=@c,b=@c,c=@c,d=@c,e=@c,f=@c,g=@c,h=@c,i=@c,j=@c,
k=@c,l=@c,m=@c,n=@c,o=@c,p=@c,q=@c,r=@c,s=@c,t=@c,u=@c, k=@c,l=@c,m=@c,n=@c,o=@c,p=@c,q=@c,r=@c,s=@c,t=@c,u=@c,
v=@c,w=@c,x=@c,y=@c,z=@c, v=@c,w=@c,x=@c,y=@c,z=@c,
...@@ -274,7 +275,7 @@ vb=@c,wb=@c,xb=@c,yb=@c,zb=@c, ...@@ -274,7 +275,7 @@ vb=@c,wb=@c,xb=@c,yb=@c,zb=@c,
ac=@c,bc=@c,cc=@c,dc=@c,ec=@c,fc=@c,gc=@c,hc=@c,ic=@c,jc=@c, ac=@c,bc=@c,cc=@c,dc=@c,ec=@c,fc=@c,gc=@c,hc=@c,ic=@c,jc=@c,
kc=@c,lc=@c,mc=@c,nc=@c,oc=@c,pc=@c,qc=@c,rc=@c,sc=@c,tc=@c,uc=@c, kc=@c,lc=@c,mc=@c,nc=@c,oc=@c,pc=@c,qc=@c,rc=@c,sc=@c,tc=@c,uc=@c,
vc=@c,wc=@c,xc=@c,yc=@c,zc=@c; vc=@c,wc=@c,xc=@c,yc=@c,zc=@c;
ERROR HY000: Lost connection to MySQL server during query # Kill and restart
UPDATE t1 SET a=@e,b=@e,c=@e,d=@e,e=@e,f=@e,g=@e,h=@e,i=@e,j=@e, UPDATE t1 SET a=@e,b=@e,c=@e,d=@e,e=@e,f=@e,g=@e,h=@e,i=@e,j=@e,
k=@e,l=@e,m=@e,n=@e,o=@e,p=@e,q=@e,r=@e,s=@e,t=@e,u=@e, k=@e,l=@e,m=@e,n=@e,o=@e,p=@e,q=@e,r=@e,s=@e,t=@e,u=@e,
v=@e,w=@e,x=@e,y=@e,z=@e, v=@e,w=@e,x=@e,y=@e,z=@e,
......
mysql-test/suite/innodb/r/innodb-blob.result
View file @ 981534b1
...@@ -33,9 +33,9 @@ a ...@@ -33,9 +33,9 @@ a
1 1
2 2
3 3
SET DEBUG_DBUG='+d,crash_commit_before'; BEGIN;
INSERT INTO t2 VALUES (42); INSERT INTO t2 VALUES (42);
ERROR HY000: Lost connection to MySQL server during query # Kill and restart
ERROR HY000: Lost connection to MySQL server during query ERROR HY000: Lost connection to MySQL server during query
CHECK TABLE t1; CHECK TABLE t1;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
...@@ -70,9 +70,7 @@ SELECT info FROM information_schema.processlist ...@@ -70,9 +70,7 @@ SELECT info FROM information_schema.processlist
WHERE state = 'debug sync point: before_row_upd_extern'; WHERE state = 'debug sync point: before_row_upd_extern';
info info
UPDATE t3 SET c=REPEAT('i',3000) WHERE a=2 UPDATE t3 SET c=REPEAT('i',3000) WHERE a=2
SET DEBUG_DBUG='+d,crash_commit_before'; # Kill and restart
COMMIT;
ERROR HY000: Lost connection to MySQL server during query
ERROR HY000: Lost connection to MySQL server during query ERROR HY000: Lost connection to MySQL server during query
CHECK TABLE t1,t2,t3; CHECK TABLE t1,t2,t3;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
...@@ -97,9 +95,7 @@ SELECT info FROM information_schema.processlist ...@@ -97,9 +95,7 @@ SELECT info FROM information_schema.processlist
WHERE state = 'debug sync point: after_row_upd_extern'; WHERE state = 'debug sync point: after_row_upd_extern';
info info
UPDATE t3 SET c=REPEAT('j',3000) WHERE a=2 UPDATE t3 SET c=REPEAT('j',3000) WHERE a=2
SET DEBUG_DBUG='+d,crash_commit_before'; # Kill and restart
COMMIT;
ERROR HY000: Lost connection to MySQL server during query
ERROR HY000: Lost connection to MySQL server during query ERROR HY000: Lost connection to MySQL server during query
CHECK TABLE t1,t2,t3; CHECK TABLE t1,t2,t3;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
......
mysql-test/suite/innodb/r/innodb_bug53756.result
View file @ 981534b1
DROP TABLE IF EXISTS bug_53756 ;
CREATE TABLE bug_53756 (pk INT, c1 INT) ENGINE=InnoDB; CREATE TABLE bug_53756 (pk INT, c1 INT) ENGINE=InnoDB;
ALTER TABLE bug_53756 ADD PRIMARY KEY (pk); ALTER TABLE bug_53756 ADD PRIMARY KEY (pk);
INSERT INTO bug_53756 VALUES(1, 11), (2, 22), (3, 33), (4, 44); INSERT INTO bug_53756 VALUES(1, 11), (2, 22), (3, 33), (4, 44);
...@@ -86,21 +85,9 @@ pk c1 ...@@ -86,21 +85,9 @@ pk c1
2 22 2 22
3 77 3 77
4 44 4 44
# connection default
#
# Crash server.
START TRANSACTION; START TRANSACTION;
INSERT INTO bug_53756 VALUES (666,666); INSERT INTO bug_53756 VALUES (666,666);
SET SESSION debug_dbug="+d,crash_commit_before"; # Kill and restart
COMMIT;
ERROR HY000: Lost connection to MySQL server during query
#
# disconnect con1, con2, con3, con4, con5, con6.
#
# Restart server.
# #
# Select recovered data. # Select recovered data.
# Delete of row 1 was committed. # Delete of row 1 was committed.
...@@ -113,6 +100,4 @@ pk c1 ...@@ -113,6 +100,4 @@ pk c1
2 22 2 22
3 77 3 77
4 44 4 44
# Clean up.
DROP TABLE bug_53756; DROP TABLE bug_53756;
mysql-test/suite/innodb/t/innodb-32k-crash.test
View file @ 981534b1
--source include/have_innodb.inc --source include/have_innodb.inc
--source include/have_innodb_32k.inc --source include/have_innodb_32k.inc
--source include/have_debug.inc # Embedded server does not support restarting
# Valgrind would complain about memory leaks when we crash on purpose.
--source include/not_valgrind.inc
# Embedded server does not support crashing
--source include/not_embedded.inc --source include/not_embedded.inc
# Avoid CrashReporter popup on Mac
--source include/not_crashrep.inc
call mtr.add_suppression("InnoDB: Warning: innodb_page_size has been changed from default value *"); call mtr.add_suppression("InnoDB: Warning: innodb_page_size has been changed from default value *");
--disable_query_log
let $MYSQLD_DATADIR= `select @@datadir`; let $MYSQLD_DATADIR= `select @@datadir`;
# These values can change during the test
let $innodb_file_format_orig = `SELECT @@innodb_file_format`;
let $innodb_file_per_table_orig = `SELECT @@innodb_file_per_table`;
let $innodb_strict_mode_orig = `SELECT @@session.innodb_strict_mode`;
--enable_query_log
SET GLOBAL innodb_file_format = `Barracuda`; SET GLOBAL innodb_file_format = `Barracuda`;
SET GLOBAL innodb_file_per_table = ON; SET GLOBAL innodb_file_per_table = ON;
...@@ -155,17 +144,11 @@ UPDATE t2 SET qa=@l,ra=@l,sa=@l,ta=@l,ua=@l; ...@@ -155,17 +144,11 @@ UPDATE t2 SET qa=@l,ra=@l,sa=@l,ta=@l,ua=@l;
UPDATE t2 SET va=@l,wa=@l,xa=@l,ya=@l,za=@l; UPDATE t2 SET va=@l,wa=@l,xa=@l,ya=@l,za=@l;
COMMIT; COMMIT;
BEGIN;
INSERT INTO t1 SELECT * from t2; INSERT INTO t1 SELECT * from t2;
SET DEBUG_DBUG='+d,crash_commit_before';
--exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
--error 2013
UPDATE t1 SET a=@e,b=@e,c=@e,d=@e,e=@e; UPDATE t1 SET a=@e,b=@e,c=@e,d=@e,e=@e;
# Write file to make mysql-test-run.pl restart the server --source include/kill_and_restart_mysqld.inc
--enable_reconnect
--source include/wait_until_connected_again.inc
--disable_reconnect
UPDATE t1 SET a=@f,b=@f,c=@f,d=@f,e=@f,f=@f,g=@f,h=@f,i=@f,j=@f, UPDATE t1 SET a=@f,b=@f,c=@f,d=@f,e=@f,f=@f,g=@f,h=@f,i=@f,j=@f,
k=@f,l=@f,m=@f,n=@f,o=@f,p=@f,q=@f,r=@f,s=@f,t=@f,u=@f, k=@f,l=@f,m=@f,n=@f,o=@f,p=@f,q=@f,r=@f,s=@f,t=@f,u=@f,
...@@ -210,13 +193,3 @@ COMMIT; ...@@ -210,13 +193,3 @@ COMMIT;
show create table t1; show create table t1;
show create table t2; show create table t2;
drop table t1,t2; drop table t1,t2;
#
# restore environment to the state it was before this test execution
#
--disable_query_log
EVAL SET GLOBAL innodb_file_format = $innodb_file_format_orig;
EVAL SET GLOBAL innodb_file_per_table = $innodb_file_per_table_orig;
EVAL SET SESSION innodb_strict_mode = $innodb_strict_mode_orig;
--enable_query_log
mysql-test/suite/innodb/t/innodb-64k-crash.test
View file @ 981534b1
--source include/have_innodb.inc --source include/have_innodb.inc
--source include/have_innodb_64k.inc --source include/have_innodb_64k.inc
--source include/have_debug.inc # Embedded server does not support restarting
# Valgrind would complain about memory leaks when we crash on purpose.
--source include/not_valgrind.inc
# Embedded server does not support crashing
--source include/not_embedded.inc --source include/not_embedded.inc
# Avoid CrashReporter popup on Mac
--source include/not_crashrep.inc
call mtr.add_suppression("InnoDB: Warning: innodb_page_size has been changed from default value *"); call mtr.add_suppression("InnoDB: Warning: innodb_page_size has been changed from default value *");
--disable_query_log
let $MYSQLD_DATADIR= `select @@datadir`; let $MYSQLD_DATADIR= `select @@datadir`;
# These values can change during the test
let $innodb_file_format_orig = `SELECT @@innodb_file_format`;
let $innodb_file_per_table_orig = `SELECT @@innodb_file_per_table`;
let $innodb_strict_mode_orig = `SELECT @@session.innodb_strict_mode`;
--enable_query_log
SET GLOBAL innodb_file_format = `Barracuda`; SET GLOBAL innodb_file_format = `Barracuda`;
SET GLOBAL innodb_file_per_table = ON; SET GLOBAL innodb_file_per_table = ON;
...@@ -301,10 +290,8 @@ UPDATE t2 SET qc=@i,rc=@i,sc=@i,tc=@i,uc=@i; ...@@ -301,10 +290,8 @@ UPDATE t2 SET qc=@i,rc=@i,sc=@i,tc=@i,uc=@i;
UPDATE t2 SET vc=@i,wc=@i,xc=@i,yc=@i,zc=@i; UPDATE t2 SET vc=@i,wc=@i,xc=@i,yc=@i,zc=@i;
COMMIT; COMMIT;
BEGIN;
SET DEBUG_DBUG='+d,crash_commit_before'; INSERT INTO t1 SELECT * from t2;
--exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
--error 2013
UPDATE t1 SET a=@c,b=@c,c=@c,d=@c,e=@c,f=@c,g=@c,h=@c,i=@c,j=@c, UPDATE t1 SET a=@c,b=@c,c=@c,d=@c,e=@c,f=@c,g=@c,h=@c,i=@c,j=@c,
k=@c,l=@c,m=@c,n=@c,o=@c,p=@c,q=@c,r=@c,s=@c,t=@c,u=@c, k=@c,l=@c,m=@c,n=@c,o=@c,p=@c,q=@c,r=@c,s=@c,t=@c,u=@c,
v=@c,w=@c,x=@c,y=@c,z=@c, v=@c,w=@c,x=@c,y=@c,z=@c,
...@@ -318,10 +305,7 @@ UPDATE t1 SET a=@c,b=@c,c=@c,d=@c,e=@c,f=@c,g=@c,h=@c,i=@c,j=@c, ...@@ -318,10 +305,7 @@ UPDATE t1 SET a=@c,b=@c,c=@c,d=@c,e=@c,f=@c,g=@c,h=@c,i=@c,j=@c,
kc=@c,lc=@c,mc=@c,nc=@c,oc=@c,pc=@c,qc=@c,rc=@c,sc=@c,tc=@c,uc=@c, kc=@c,lc=@c,mc=@c,nc=@c,oc=@c,pc=@c,qc=@c,rc=@c,sc=@c,tc=@c,uc=@c,
vc=@c,wc=@c,xc=@c,yc=@c,zc=@c; vc=@c,wc=@c,xc=@c,yc=@c,zc=@c;
# Write file to make mysql-test-run.pl restart the server --source include/kill_and_restart_mysqld.inc
--enable_reconnect
--source include/wait_until_connected_again.inc
--disable_reconnect
UPDATE t1 SET a=@e,b=@e,c=@e,d=@e,e=@e,f=@e,g=@e,h=@e,i=@e,j=@e, UPDATE t1 SET a=@e,b=@e,c=@e,d=@e,e=@e,f=@e,g=@e,h=@e,i=@e,j=@e,
k=@e,l=@e,m=@e,n=@e,o=@e,p=@e,q=@e,r=@e,s=@e,t=@e,u=@e, k=@e,l=@e,m=@e,n=@e,o=@e,p=@e,q=@e,r=@e,s=@e,t=@e,u=@e,
...@@ -400,13 +384,3 @@ COMMIT; ...@@ -400,13 +384,3 @@ COMMIT;
show create table t1; show create table t1;
show create table t2; show create table t2;
drop table t1,t2; drop table t1,t2;
#
# restore environment to the state it was before this test execution
#
--disable_query_log
EVAL SET GLOBAL innodb_file_format = $innodb_file_format_orig;
EVAL SET GLOBAL innodb_file_per_table = $innodb_file_per_table_orig;
EVAL SET SESSION innodb_strict_mode = $innodb_strict_mode_orig;
--enable_query_log
mysql-test/suite/innodb/t/innodb-blob.test
View file @ 981534b1
...@@ -8,12 +8,8 @@ ...@@ -8,12 +8,8 @@
# DEBUG_SYNC must be compiled in. # DEBUG_SYNC must be compiled in.
--source include/have_debug_sync.inc --source include/have_debug_sync.inc
# Valgrind would complain about memory leaks when we crash on purpose. # Embedded server does not support restarting
--source include/not_valgrind.inc
# Embedded server does not support crashing
--source include/not_embedded.inc --source include/not_embedded.inc
# Avoid CrashReporter popup on Mac
--source include/not_crashrep.inc
CREATE TABLE t1 (a INT PRIMARY KEY, b TEXT) ENGINE=InnoDB; CREATE TABLE t1 (a INT PRIMARY KEY, b TEXT) ENGINE=InnoDB;
CREATE TABLE t2 (a INT PRIMARY KEY) ENGINE=InnoDB; CREATE TABLE t2 (a INT PRIMARY KEY) ENGINE=InnoDB;
...@@ -68,11 +64,11 @@ SELECT a, RIGHT(b,20) FROM t1; ...@@ -68,11 +64,11 @@ SELECT a, RIGHT(b,20) FROM t1;
SELECT a FROM t1; SELECT a FROM t1;
# Request a crash, and restart the server. # Request a crash, and restart the server.
SET DEBUG_DBUG='+d,crash_commit_before'; BEGIN;
--exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
--error 2013
INSERT INTO t2 VALUES (42); INSERT INTO t2 VALUES (42);
--source include/kill_and_restart_mysqld.inc
disconnect con1; disconnect con1;
disconnect con2; disconnect con2;
connection default; connection default;
...@@ -80,7 +76,6 @@ connection default; ...@@ -80,7 +76,6 @@ connection default;
--error 2013 --error 2013
reap; reap;
# Write file to make mysql-test-run.pl restart the server
--enable_reconnect --enable_reconnect
--source include/wait_until_connected_again.inc --source include/wait_until_connected_again.inc
--disable_reconnect --disable_reconnect
...@@ -147,11 +142,7 @@ SET DEBUG_SYNC='now WAIT_FOR have_latch'; ...@@ -147,11 +142,7 @@ SET DEBUG_SYNC='now WAIT_FOR have_latch';
SELECT info FROM information_schema.processlist SELECT info FROM information_schema.processlist
WHERE state = 'debug sync point: before_row_upd_extern'; WHERE state = 'debug sync point: before_row_upd_extern';
# Request a crash, and restart the server. --source include/kill_and_restart_mysqld.inc
SET DEBUG_DBUG='+d,crash_commit_before';
--exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
--error 2013
COMMIT;
disconnect con2; disconnect con2;
connection default; connection default;
...@@ -159,7 +150,6 @@ connection default; ...@@ -159,7 +150,6 @@ connection default;
--error 2013 --error 2013
reap; reap;
# Write file to make mysql-test-run.pl restart the server
--enable_reconnect --enable_reconnect
--source include/wait_until_connected_again.inc --source include/wait_until_connected_again.inc
--disable_reconnect --disable_reconnect
...@@ -191,11 +181,7 @@ SET DEBUG_SYNC='now WAIT_FOR have_latch'; ...@@ -191,11 +181,7 @@ SET DEBUG_SYNC='now WAIT_FOR have_latch';
SELECT info FROM information_schema.processlist SELECT info FROM information_schema.processlist
WHERE state = 'debug sync point: after_row_upd_extern'; WHERE state = 'debug sync point: after_row_upd_extern';
# Request a crash, and restart the server. --source include/kill_and_restart_mysqld.inc
SET DEBUG_DBUG='+d,crash_commit_before';
--exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
--error 2013
COMMIT;
disconnect con2; disconnect con2;
connection default; connection default;
...@@ -203,11 +189,9 @@ connection default; ...@@ -203,11 +189,9 @@ connection default;
--error 2013 --error 2013
reap; reap;
# Write file to make mysql-test-run.pl restart the server
--enable_reconnect --enable_reconnect
--source include/wait_until_connected_again.inc --source include/wait_until_connected_again.inc
--disable_reconnect --disable_reconnect
CHECK TABLE t1,t2,t3; CHECK TABLE t1,t2,t3;
SELECT a, RIGHT(b,20), RIGHT(c,20) FROM t3; SELECT a, RIGHT(b,20), RIGHT(c,20) FROM t3;
SELECT a FROM t3; SELECT a FROM t3;
......
mysql-test/suite/innodb/t/innodb_bug53756.test
View file @ 981534b1
...@@ -6,24 +6,8 @@ ...@@ -6,24 +6,8 @@
# metadata in the function dict_load_table_on_id() during crash recovery. # metadata in the function dict_load_table_on_id() during crash recovery.
# #
# innobackup needs to connect to the server. Not supported in embedded. # The embedded server test does not support restarting.
--source include/not_embedded.inc --source include/not_embedded.inc
#
# This test case needs to crash the server. Needs a debug server.
--source include/have_debug.inc
#
# Don't test this under valgrind, memory leaks will occur.
--source include/not_valgrind.inc
# Avoid CrashReporter popup on Mac
--source include/not_crashrep.inc
#
# Precautionary clean up.
#
--disable_warnings
DROP TABLE IF EXISTS bug_53756 ;
--enable_warnings
# #
# Create test data. # Create test data.
...@@ -34,9 +18,6 @@ INSERT INTO bug_53756 VALUES(1, 11), (2, 22), (3, 33), (4, 44); ...@@ -34,9 +18,6 @@ INSERT INTO bug_53756 VALUES(1, 11), (2, 22), (3, 33), (4, 44);
--echo --echo
--echo # Select a less restrictive isolation level. --echo # Select a less restrictive isolation level.
# Don't use user variables. They won't survive server crash.
--let $global_isolation= `SELECT @@global.tx_isolation`
--let $session_isolation= `SELECT @@session.tx_isolation`
SET GLOBAL TRANSACTION ISOLATION LEVEL READ COMMITTED; SET GLOBAL TRANSACTION ISOLATION LEVEL READ COMMITTED;
SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED; SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED;
COMMIT; COMMIT;
...@@ -121,49 +102,16 @@ ROLLBACK; ...@@ -121,49 +102,16 @@ ROLLBACK;
--connection default --connection default
SELECT * FROM bug_53756; SELECT * FROM bug_53756;
--echo
--echo # connection default
--connection default
--echo #
--echo # Crash server.
#
# Write file to make mysql-test-run.pl expect the "crash", but don't start
# it until it's told to
--exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
#
START TRANSACTION; START TRANSACTION;
INSERT INTO bug_53756 VALUES (666,666); INSERT INTO bug_53756 VALUES (666,666);
#
# Request a crash on next execution of commit. --source include/kill_and_restart_mysqld.inc
SET SESSION debug_dbug="+d,crash_commit_before";
#
# Write file to make mysql-test-run.pl start up the server again
--exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
#
# Execute the statement that causes the crash.
--error 2013
COMMIT;
--echo
--echo #
--echo # disconnect con1, con2, con3, con4, con5, con6.
--disconnect con1 --disconnect con1
--disconnect con2 --disconnect con2
--disconnect con3 --disconnect con3
--disconnect con4 --disconnect con4
--disconnect con5 --disconnect con5
--disconnect con6 --disconnect con6
--echo #
--echo # Restart server.
#
# Turn on reconnect
--enable_reconnect
#
# Call script that will poll the server waiting for it to be back online again
--source include/wait_until_connected_again.inc
#
# Turn off reconnect again
--disable_reconnect
--echo
--echo # --echo #
--echo # Select recovered data. --echo # Select recovered data.
...@@ -174,12 +122,4 @@ COMMIT; ...@@ -174,12 +122,4 @@ COMMIT;
--echo # Delete of row 2 and insert of row 5 should be rolled back --echo # Delete of row 2 and insert of row 5 should be rolled back
SELECT * FROM bug_53756; SELECT * FROM bug_53756;
--echo
--echo # Clean up.
DROP TABLE bug_53756; DROP TABLE bug_53756;
--disable_query_log
eval SET GLOBAL tx_isolation= '$global_isolation';
eval SET SESSION tx_isolation= '$session_isolation';
--enable_query_log
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7