summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Lindström <jan.lindstrom@skysql.com>2015-02-22 08:46:22 +0200
committerJan Lindström <jan.lindstrom@skysql.com>2015-02-22 08:46:22 +0200
commitb2862912af1af30158208197f979d5395494bf8f (patch)
tree19d0a522e671eeb5faf13482cbc7671d98b59c09
parent1cc7befc14cd2ad637ffb6fc29fae0f978735acf (diff)
downloadmariadb-git-b2862912af1af30158208197f979d5395494bf8f.tar.gz
Try to stabilize test case. Problem was that test compares number
of encryption/compression pages and that will happen if and only if dirty pages are written to the disk.
-rw-r--r--mysql-test/suite/innodb/r/innodb-page_encryption_compression.result34
-rw-r--r--mysql-test/suite/innodb/t/innodb-page_encryption_compression.test4
2 files changed, 19 insertions, 19 deletions
diff --git a/mysql-test/suite/innodb/r/innodb-page_encryption_compression.result b/mysql-test/suite/innodb/r/innodb-page_encryption_compression.result
index 124a18dc603..781a29cb276 100644
--- a/mysql-test/suite/innodb/r/innodb-page_encryption_compression.result
+++ b/mysql-test/suite/innodb/r/innodb-page_encryption_compression.result
@@ -29,13 +29,13 @@ begin
declare current_num int;
set current_num = 0;
while current_num < repeat_count do
-insert into innodb_normal values(current_num, substring(MD5(RAND()), -64));
+insert into innodb_normal values(current_num, substring(MD5(RAND()), -128));
set current_num = current_num + 1;
end while;
end//
commit;
set autocommit=0;
-call innodb_insert_proc(2000);
+call innodb_insert_proc(5000);
commit;
set autocommit=1;
insert into innodb_compact select * from innodb_normal;
@@ -45,21 +45,21 @@ update innodb_compact set c1 = c1 + 1;
update innodb_dynamic set c1 = c1 + 1;
select count(*) from innodb_normal;
count(*)
-2000
+5000
select count(*) from innodb_compact where c1 < 1500000;
count(*)
-2000
+5000
select count(*) from innodb_dynamic where c1 < 1500000;
count(*)
-2000
+5000
select count(*) from innodb_compact t1, innodb_normal t2 where
t1.c1 = t2.c1 and t1.b = t2.b;
count(*)
-2000
+5000
select count(*) from innodb_dynamic t1, innodb_normal t2 where
t1.c1 = t2.c1 and t1.b = t2.b;
count(*)
-2000
+5000
SELECT variable_value >= 0 FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_num_pages_page_encrypted';
variable_value >= 0
1
@@ -83,21 +83,21 @@ update innodb_compact set c1 = c1 + 1;
update innodb_dynamic set c1 = c1 + 1;
select count(*) from innodb_normal;
count(*)
-2000
+5000
select count(*) from innodb_compact where c1 < 1500000;
count(*)
-2000
+5000
select count(*) from innodb_dynamic where c1 < 1500000;
count(*)
-2000
+5000
select count(*) from innodb_compact t1, innodb_normal t2 where
t1.c1 = t2.c1 and t1.b = t2.b;
count(*)
-2000
+5000
select count(*) from innodb_dynamic t1, innodb_normal t2 where
t1.c1 = t2.c1 and t1.b = t2.b;
count(*)
-2000
+5000
SELECT variable_value >= 0 FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_num_pages_page_encrypted';
variable_value >= 0
1
@@ -159,21 +159,21 @@ update innodb_compact set c1 = c1 + 1;
update innodb_dynamic set c1 = c1 + 1;
select count(*) from innodb_normal;
count(*)
-2000
+5000
select count(*) from innodb_compact where c1 < 1500000;
count(*)
-2000
+5000
select count(*) from innodb_dynamic where c1 < 1500000;
count(*)
-2000
+5000
select count(*) from innodb_compact t1, innodb_normal t2 where
t1.c1 = t2.c1 and t1.b = t2.b;
count(*)
-2000
+5000
select count(*) from innodb_dynamic t1, innodb_normal t2 where
t1.c1 = t2.c1 and t1.b = t2.b;
count(*)
-2000
+5000
SELECT variable_value = 0 FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_num_pages_page_encrypted';
variable_value = 0
1
diff --git a/mysql-test/suite/innodb/t/innodb-page_encryption_compression.test b/mysql-test/suite/innodb/t/innodb-page_encryption_compression.test
index ed5276ae059..6b9fb5bca9d 100644
--- a/mysql-test/suite/innodb/t/innodb-page_encryption_compression.test
+++ b/mysql-test/suite/innodb/t/innodb-page_encryption_compression.test
@@ -27,7 +27,7 @@ begin
declare current_num int;
set current_num = 0;
while current_num < repeat_count do
- insert into innodb_normal values(current_num, substring(MD5(RAND()), -64));
+ insert into innodb_normal values(current_num, substring(MD5(RAND()), -128));
set current_num = current_num + 1;
end while;
end//
@@ -35,7 +35,7 @@ delimiter ;//
commit;
set autocommit=0;
-call innodb_insert_proc(2000);
+call innodb_insert_proc(5000);
commit;
set autocommit=1;