Commit d06e4fc6 authored by Marko Mäkelä's avatar Marko Mäkelä

Do not require a debug non-embedded server in the test

This also avoids hitting the hang at server shutdown.
That hang should be fixed, of course.
parent dd35fb35
set global innodb_purge_stop_now = 1; SET @saved_frequency = @@GLOBAL.innodb_purge_rseg_truncate_frequency;
SET GLOBAL innodb_purge_rseg_truncate_frequency = 1;
connect purge_control,localhost,root;
START TRANSACTION WITH CONSISTENT SNAPSHOT;
connection default;
create table t1(f1 int not null, f2 blob not null, f3 blob not null, create table t1(f1 int not null, f2 blob not null, f3 blob not null,
vchar char(2) as (substr(f3,2,2)) virtual, vchar char(2) as (substr(f3,2,2)) virtual,
primary key(f1, f3(5)), index(vchar))engine=innodb; primary key(f1, f3(5)), index(vchar))engine=innodb;
insert into t1(f1,f2,f3) values(1, repeat('a',8000), repeat('b', 9000)); insert into t1(f1,f2,f3) values(1, repeat('a',8000), repeat('b', 9000));
update t1 set f1=5 where f1=1; update t1 set f1=5 where f1=1;
delete from t1 where f1=5; delete from t1 where f1=5;
set global innodb_purge_run_now=1; connection purge_control;
set global innodb_fast_shutdown=0; COMMIT;
set global innodb_purge_stop_now = 1; InnoDB 0 transactions not purged
START TRANSACTION WITH CONSISTENT SNAPSHOT;
connection default;
drop table t1; drop table t1;
create table t1(f1 int not null, f2 blob not null, f3 blob not null, create table t1(f1 int not null, f2 blob not null, f3 blob not null,
vchar char(2) as (substr(f3,2,2)) virtual, vchar char(2) as (substr(f3,2,2)) virtual,
...@@ -15,9 +21,11 @@ primary key(f1, f3(5)), index(vchar, f3(2)))engine=innodb; ...@@ -15,9 +21,11 @@ primary key(f1, f3(5)), index(vchar, f3(2)))engine=innodb;
insert into t1(f1,f2,f3) values(1, repeat('a',8000), repeat('b', 9000)); insert into t1(f1,f2,f3) values(1, repeat('a',8000), repeat('b', 9000));
update t1 set f1=5 where f1=1; update t1 set f1=5 where f1=1;
delete from t1 where f1=5; delete from t1 where f1=5;
set global innodb_purge_run_now=1; connection purge_control;
set global innodb_fast_shutdown=0; COMMIT;
set global innodb_purge_stop_now = 1; InnoDB 0 transactions not purged
START TRANSACTION WITH CONSISTENT SNAPSHOT;
connection default;
drop table t1; drop table t1;
create table t1(f1 int not null, f2 blob not null, f3 blob not null, create table t1(f1 int not null, f2 blob not null, f3 blob not null,
vchar blob as (f3) virtual, vchar blob as (f3) virtual,
...@@ -25,6 +33,10 @@ primary key(f1, f3(5)), index(vchar(3)))engine=innodb; ...@@ -25,6 +33,10 @@ primary key(f1, f3(5)), index(vchar(3)))engine=innodb;
insert into t1(f1,f2,f3) values(1, repeat('a',8000), repeat('b', 9000)); insert into t1(f1,f2,f3) values(1, repeat('a',8000), repeat('b', 9000));
update t1 set f1=5 where f1=1; update t1 set f1=5 where f1=1;
delete from t1 where f1=5; delete from t1 where f1=5;
set global innodb_purge_run_now=1; connection purge_control;
set global innodb_fast_shutdown=0; COMMIT;
InnoDB 0 transactions not purged
disconnect purge_control;
connection default;
drop table t1; drop table t1;
SET GLOBAL innodb_purge_rseg_truncate_frequency = @saved_frequency;
--source include/have_debug.inc
--source include/have_innodb.inc --source include/have_innodb.inc
# The embedded server does not support restarting.
--source include/not_embedded.inc
set global innodb_purge_stop_now = 1; SET @saved_frequency = @@GLOBAL.innodb_purge_rseg_truncate_frequency;
SET GLOBAL innodb_purge_rseg_truncate_frequency = 1;
connect (purge_control,localhost,root);
START TRANSACTION WITH CONSISTENT SNAPSHOT;
connection default;
# Index on virtual column # Index on virtual column
...@@ -16,10 +19,12 @@ insert into t1(f1,f2,f3) values(1, repeat('a',8000), repeat('b', 9000)); ...@@ -16,10 +19,12 @@ insert into t1(f1,f2,f3) values(1, repeat('a',8000), repeat('b', 9000));
update t1 set f1=5 where f1=1; update t1 set f1=5 where f1=1;
delete from t1 where f1=5; delete from t1 where f1=5;
set global innodb_purge_run_now=1; connection purge_control;
set global innodb_fast_shutdown=0; COMMIT;
--source include/restart_mysqld.inc --source ../../innodb/include/wait_all_purged.inc
set global innodb_purge_stop_now = 1; START TRANSACTION WITH CONSISTENT SNAPSHOT;
connection default;
drop table t1; drop table t1;
# Index on virtual column and blob # Index on virtual column and blob
...@@ -33,10 +38,11 @@ insert into t1(f1,f2,f3) values(1, repeat('a',8000), repeat('b', 9000)); ...@@ -33,10 +38,11 @@ insert into t1(f1,f2,f3) values(1, repeat('a',8000), repeat('b', 9000));
update t1 set f1=5 where f1=1; update t1 set f1=5 where f1=1;
delete from t1 where f1=5; delete from t1 where f1=5;
set global innodb_purge_run_now=1; connection purge_control;
set global innodb_fast_shutdown=0; COMMIT;
--source include/restart_mysqld.inc --source ../../innodb/include/wait_all_purged.inc
set global innodb_purge_stop_now = 1; START TRANSACTION WITH CONSISTENT SNAPSHOT;
connection default;
drop table t1; drop table t1;
# Index on virtual column of blob type # Index on virtual column of blob type
...@@ -50,7 +56,12 @@ insert into t1(f1,f2,f3) values(1, repeat('a',8000), repeat('b', 9000)); ...@@ -50,7 +56,12 @@ insert into t1(f1,f2,f3) values(1, repeat('a',8000), repeat('b', 9000));
update t1 set f1=5 where f1=1; update t1 set f1=5 where f1=1;
delete from t1 where f1=5; delete from t1 where f1=5;
set global innodb_purge_run_now=1; connection purge_control;
set global innodb_fast_shutdown=0; COMMIT;
--source include/restart_mysqld.inc --source ../../innodb/include/wait_all_purged.inc
disconnect purge_control;
connection default;
drop table t1; drop table t1;
SET GLOBAL innodb_purge_rseg_truncate_frequency = @saved_frequency;
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