Commit 45e1c9bb authored by Sergei Golubchik's avatar Sergei Golubchik

cleanup: remove a pretty formatting function from a test

parent 9fa715b8
...@@ -6,9 +6,6 @@ period for system_time (sys_trx_start, sys_trx_end) ...@@ -6,9 +6,6 @@ period for system_time (sys_trx_start, sys_trx_end)
) with system versioning engine innodb; ) with system versioning engine innodb;
insert into t1 (x) values (1); insert into t1 (x) values (1);
# ALTER ADD SYSTEM VERSIONING should write to mysql.transaction_registry # ALTER ADD SYSTEM VERSIONING should write to mysql.transaction_registry
create function check_result (cond boolean)
returns char(50) deterministic
return if(cond = 1, '[CORRECT]', '[INCORRECT]');
set @@system_versioning_alter_history=keep; set @@system_versioning_alter_history=keep;
create or replace table t1 (x int) engine innodb; create or replace table t1 (x int) engine innodb;
insert into t1 values (1); insert into t1 values (1);
...@@ -19,9 +16,9 @@ add period for system_time(s, e), ...@@ -19,9 +16,9 @@ add period for system_time(s, e),
add system versioning, add system versioning,
algorithm=inplace; algorithm=inplace;
select s from t1 into @trx_start; select s from t1 into @trx_start;
select check_result(count(*) = 1) from mysql.transaction_registry where transaction_id = @trx_start; select count(*) = 1 from mysql.transaction_registry where transaction_id = @trx_start;
check_result(count(*) = 1) count(*) = 1
[CORRECT] 1
create or replace table t1 (x int) engine innodb; create or replace table t1 (x int) engine innodb;
select count(*) from mysql.transaction_registry into @tmp; select count(*) from mysql.transaction_registry into @tmp;
alter table t1 alter table t1
...@@ -30,9 +27,9 @@ add column e bigint unsigned as row end, ...@@ -30,9 +27,9 @@ add column e bigint unsigned as row end,
add period for system_time(s, e), add period for system_time(s, e),
add system versioning, add system versioning,
algorithm=inplace; algorithm=inplace;
select check_result(count(*) = @tmp) from mysql.transaction_registry; select count(*) = @tmp from mysql.transaction_registry;
check_result(count(*) = @tmp) count(*) = @tmp
[CORRECT] 1
create or replace table t1 (x int) engine innodb; create or replace table t1 (x int) engine innodb;
insert into t1 values (1); insert into t1 values (1);
alter table t1 alter table t1
...@@ -42,9 +39,9 @@ add period for system_time(s, e), ...@@ -42,9 +39,9 @@ add period for system_time(s, e),
add system versioning, add system versioning,
algorithm=copy; algorithm=copy;
select s from t1 into @trx_start; select s from t1 into @trx_start;
select check_result(count(*) = 1) from mysql.transaction_registry where transaction_id = @trx_start; select count(*) = 1 from mysql.transaction_registry where transaction_id = @trx_start;
check_result(count(*) = 1) count(*) = 1
[CORRECT] 1
create or replace table t1 (x int) engine innodb; create or replace table t1 (x int) engine innodb;
select count(*) from mysql.transaction_registry into @tmp; select count(*) from mysql.transaction_registry into @tmp;
alter table t1 alter table t1
...@@ -53,9 +50,9 @@ add column e bigint unsigned as row end, ...@@ -53,9 +50,9 @@ add column e bigint unsigned as row end,
add period for system_time(s, e), add period for system_time(s, e),
add system versioning, add system versioning,
algorithm=copy; algorithm=copy;
select check_result(count(*) = @tmp + 1) from mysql.transaction_registry; select count(*) = @tmp + 1 from mysql.transaction_registry;
check_result(count(*) = @tmp + 1) count(*) = @tmp + 1
[CORRECT] 1
# TRX_ID to TIMESTAMP versioning switch # TRX_ID to TIMESTAMP versioning switch
create or replace table t1 ( create or replace table t1 (
x int, x int,
...@@ -69,4 +66,3 @@ select row_end = 18446744073709551615 as transaction_based from t1 for system_ti ...@@ -69,4 +66,3 @@ select row_end = 18446744073709551615 as transaction_based from t1 for system_ti
transaction_based transaction_based
1 1
drop table t1; drop table t1;
drop function check_result;
...@@ -11,10 +11,6 @@ create or replace table t1 ( ...@@ -11,10 +11,6 @@ create or replace table t1 (
insert into t1 (x) values (1); insert into t1 (x) values (1);
--echo # ALTER ADD SYSTEM VERSIONING should write to mysql.transaction_registry --echo # ALTER ADD SYSTEM VERSIONING should write to mysql.transaction_registry
create function check_result (cond boolean)
returns char(50) deterministic
return if(cond = 1, '[CORRECT]', '[INCORRECT]');
set @@system_versioning_alter_history=keep; set @@system_versioning_alter_history=keep;
create or replace table t1 (x int) engine innodb; create or replace table t1 (x int) engine innodb;
...@@ -26,7 +22,7 @@ alter table t1 ...@@ -26,7 +22,7 @@ alter table t1
add system versioning, add system versioning,
algorithm=inplace; algorithm=inplace;
select s from t1 into @trx_start; select s from t1 into @trx_start;
select check_result(count(*) = 1) from mysql.transaction_registry where transaction_id = @trx_start; select count(*) = 1 from mysql.transaction_registry where transaction_id = @trx_start;
create or replace table t1 (x int) engine innodb; create or replace table t1 (x int) engine innodb;
select count(*) from mysql.transaction_registry into @tmp; select count(*) from mysql.transaction_registry into @tmp;
...@@ -36,7 +32,7 @@ alter table t1 ...@@ -36,7 +32,7 @@ alter table t1
add period for system_time(s, e), add period for system_time(s, e),
add system versioning, add system versioning,
algorithm=inplace; algorithm=inplace;
select check_result(count(*) = @tmp) from mysql.transaction_registry; select count(*) = @tmp from mysql.transaction_registry;
create or replace table t1 (x int) engine innodb; create or replace table t1 (x int) engine innodb;
insert into t1 values (1); insert into t1 values (1);
...@@ -47,7 +43,7 @@ alter table t1 ...@@ -47,7 +43,7 @@ alter table t1
add system versioning, add system versioning,
algorithm=copy; algorithm=copy;
select s from t1 into @trx_start; select s from t1 into @trx_start;
select check_result(count(*) = 1) from mysql.transaction_registry where transaction_id = @trx_start; select count(*) = 1 from mysql.transaction_registry where transaction_id = @trx_start;
create or replace table t1 (x int) engine innodb; create or replace table t1 (x int) engine innodb;
select count(*) from mysql.transaction_registry into @tmp; select count(*) from mysql.transaction_registry into @tmp;
...@@ -58,7 +54,7 @@ alter table t1 ...@@ -58,7 +54,7 @@ alter table t1
add system versioning, add system versioning,
algorithm=copy; algorithm=copy;
# With MDEV-14511 the transaction will be registered even for empty tables. # With MDEV-14511 the transaction will be registered even for empty tables.
select check_result(count(*) = @tmp + 1) from mysql.transaction_registry; select count(*) = @tmp + 1 from mysql.transaction_registry;
--echo # TRX_ID to TIMESTAMP versioning switch --echo # TRX_ID to TIMESTAMP versioning switch
create or replace table t1 ( create or replace table t1 (
...@@ -72,4 +68,3 @@ alter table t1 drop column sys_start, drop column sys_end; ...@@ -72,4 +68,3 @@ alter table t1 drop column sys_start, drop column sys_end;
select row_end = 18446744073709551615 as transaction_based from t1 for system_time all; select row_end = 18446744073709551615 as transaction_based from t1 for system_time all;
drop table t1; drop table t1;
drop function check_result;
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