database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Re-remove the file kill_and_restart_mysqld.inc

Browse Source
This commit is contained in:
Marko Mäkelä
2017-12-13 23:14:54 +02:00
parent ece9c54e10
commit 8063804943
12 changed files with 11 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
mysql-test/include/kill_and_restart_mysqld.inc
View File

@ -1,15 +0,0 @@
if (!$restart_parameters)
{
let $restart_parameters = restart;
}
--let $_server_id= `SELECT @@server_id`
--let $_expect_file_name= $MYSQLTEST_VARDIR/tmp/mysqld.$_server_id.expect
--echo # Kill and $restart_parameters
--exec echo "$restart_parameters" > $_expect_file_name
--shutdown_server 0
--source include/wait_until_disconnected.inc
--enable_reconnect
--source include/wait_until_connected_again.inc
--disable_reconnect

1
mysql-test/suite/innodb/r/update_time.result
View File

@ -43,7 +43,6 @@ XA PREPARE 'xatrx';
CONNECT con1,localhost,root,,; CONNECT con1,localhost,root,,;
call mtr.add_suppression("Found 1 prepared XA transactions"); call mtr.add_suppression("Found 1 prepared XA transactions");
FLUSH TABLES; FLUSH TABLES;
# Kill and restart
SELECT update_time FROM information_schema.tables WHERE table_name = 't'; SELECT update_time FROM information_schema.tables WHERE table_name = 't';
update_time update_time
NULL NULL

3
mysql-test/suite/innodb/t/update_time.test
View File

@ -67,7 +67,8 @@ CONNECT (con1,localhost,root,,);
call mtr.add_suppression("Found 1 prepared XA transactions"); call mtr.add_suppression("Found 1 prepared XA transactions");
FLUSH TABLES; FLUSH TABLES;
--source include/kill_and_restart_mysqld.inc --let $shutdown_timeout=0
--source include/restart_mysqld.inc
SELECT update_time FROM information_schema.tables WHERE table_name = 't'; SELECT update_time FROM information_schema.tables WHERE table_name = 't';

1
mysql-test/suite/innodb_gis/r/kill_server.result
View File

@ -36,6 +36,5 @@ call mtr.add_suppression("InnoDB: A copy of page \[page id: space=[0-9]+, page n
START TRANSACTION; START TRANSACTION;
CALL insert_t1(5000); CALL insert_t1(5000);
COMMIT; COMMIT;
# Kill and restart
drop procedure insert_t1; drop procedure insert_t1;
drop table t1; drop table t1;

1
mysql-test/suite/innodb_gis/r/rtree_compress2.result
View File

@ -20,6 +20,5 @@ call mtr.add_suppression("InnoDB: A copy of page \[page id: space=[0-9]+, page n
START TRANSACTION; START TRANSACTION;
CALL insert_t1(5000); CALL insert_t1(5000);
COMMIT; COMMIT;
# Kill and restart
drop procedure insert_t1; drop procedure insert_t1;
drop table t1; drop table t1;

41
mysql-test/suite/innodb_gis/r/rtree_crash.result
View File

@ -1,41 +0,0 @@
create table t1 (c1 int, c2 geometry not null, spatial index (c2))engine=innodb;
create procedure insert_t1(IN total int)
begin
declare i int default 1;
while (i <= total) DO
insert into t1 values (i, Point(i, i));
set i = i + 1;
end while;
end|
CALL insert_t1(5000);
select count(*) from t1;
count(*)
5000
check table t1;
Table Op Msg_type Msg_text
test.t1 check status OK
truncate table t1;
CALL insert_t1(10000);
select count(*) from t1;
count(*)
10000
drop index c2 on t1;
create spatial index idx on t1(c2);
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
`c1` int(11) DEFAULT NULL,
`c2` geometry NOT NULL,
SPATIAL KEY `idx` (`c2`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1
check table t1;
Table Op Msg_type Msg_text
test.t1 check status OK
truncate table t1;
call mtr.add_suppression("InnoDB: page [0-9]+ in the doublewrite buffer is not within space bounds.*");
START TRANSACTION;
CALL insert_t1(5000);
COMMIT;
# Kill and restart
drop procedure insert_t1;
drop table t1;

2
mysql-test/suite/innodb_gis/r/rtree_recovery.result
View File

@ -18,7 +18,6 @@ end while;
end| end|
CALL insert_t1(367); CALL insert_t1(367);
COMMIT; COMMIT;
# Kill and restart
check table t1; check table t1;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t1 check status OK test.t1 check status OK
@ -29,7 +28,6 @@ CALL update_t1(367);
SET @poly1 = ST_GeomFromText('POLYGON((10000 10000, 10000 10350, 10350 10350, 10350 10000, 10000 10000))'); SET @poly1 = ST_GeomFromText('POLYGON((10000 10000, 10000 10350, 10350 10350, 10350 10000, 10000 10000))');
delete from t1 where ST_Contains(@poly1, c2); delete from t1 where ST_Contains(@poly1, c2);
COMMIT; COMMIT;
# Kill and restart
check table t1; check table t1;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t1 check status OK test.t1 check status OK

1
mysql-test/suite/innodb_gis/r/types.result
View File

@ -53,7 +53,6 @@ COMMIT;
INSERT INTO t_wl6455 VALUES(11, POINT(11,11)); INSERT INTO t_wl6455 VALUES(11, POINT(11,11));
BEGIN; BEGIN;
INSERT INTO t_wl6455 VALUES(1, POINT(1,1)); INSERT INTO t_wl6455 VALUES(1, POINT(1,1));
# Kill and restart
CHECK TABLE t_wl6455; CHECK TABLE t_wl6455;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t_wl6455 check status OK test.t_wl6455 check status OK

3
mysql-test/suite/innodb_gis/t/kill_server.test
View File

@ -58,7 +58,8 @@ CALL insert_t1(5000);
COMMIT; COMMIT;
--source include/kill_and_restart_mysqld.inc --let $shutdown_timeout=0
--source include/restart_mysqld.inc
# Clean up. # Clean up.
drop procedure insert_t1; drop procedure insert_t1;

3
mysql-test/suite/innodb_gis/t/rtree_compress2.test
View File

@ -51,7 +51,8 @@ CALL insert_t1(5000);
COMMIT; COMMIT;
--source include/kill_and_restart_mysqld.inc --let $shutdown_timeout=0
--source include/restart_mysqld.inc
# Clean up. # Clean up.
drop procedure insert_t1; drop procedure insert_t1;

5
mysql-test/suite/innodb_gis/t/rtree_recovery.test
View File

@ -44,7 +44,8 @@ delimiter ;|
CALL insert_t1(367); CALL insert_t1(367);
COMMIT; COMMIT;
--source include/kill_and_restart_mysqld.inc --let $shutdown_timeout=0
--source include/restart_mysqld.inc
# Check table. # Check table.
check table t1; check table t1;
@ -63,7 +64,7 @@ SET @poly1 = ST_GeomFromText('POLYGON((10000 10000, 10000 10350, 10350 10350, 10
delete from t1 where ST_Contains(@poly1, c2); delete from t1 where ST_Contains(@poly1, c2);
COMMIT; COMMIT;
--source include/kill_and_restart_mysqld.inc --source include/restart_mysqld.inc
# Check table. # Check table.
check table t1; check table t1;

3
mysql-test/suite/innodb_gis/t/types.test
View File

@ -73,7 +73,8 @@ INSERT INTO t_wl6455 VALUES(11, POINT(11,11));
BEGIN; BEGIN;
INSERT INTO t_wl6455 VALUES(1, POINT(1,1)); INSERT INTO t_wl6455 VALUES(1, POINT(1,1));
--source include/kill_and_restart_mysqld.inc --let $shutdown_timeout=0
--source include/restart_mysqld.inc
CHECK TABLE t_wl6455; CHECK TABLE t_wl6455;
SELECT ST_AsText(g) FROM t_wl6455; SELECT ST_AsText(g) FROM t_wl6455;