summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Lindström <jan.lindstrom@mariadb.com>2017-03-29 08:08:50 +0300
committerJan Lindström <jan.lindstrom@mariadb.com>2017-03-29 08:08:50 +0300
commit2810ee2af7bdcdb4c53f437fde797906ebe9b772 (patch)
tree3ed687ccb4017563721665c3631ca7201ca41899
parentc5520a37d6111991157d8da91b1ae4b9e7cbf50c (diff)
downloadmariadb-git-bb-10.2-MDEV-11629.tar.gz
MDEV-11629: Unknown table 'innodb_cmp_per_index_reset' inbb-10.2-MDEV-11629
information_schema. Added .opt file to enable running this test as a part of innodb_zip suite and recorded current correct results.
-rw-r--r--mysql-test/suite/innodb_zip/disabled.def2
-rw-r--r--mysql-test/suite/innodb_zip/r/cmp_per_index.result17
-rw-r--r--mysql-test/suite/innodb_zip/t/cmp_per_index.opt2
3 files changed, 14 insertions, 7 deletions
diff --git a/mysql-test/suite/innodb_zip/disabled.def b/mysql-test/suite/innodb_zip/disabled.def
index 294204f409c..8b137891791 100644
--- a/mysql-test/suite/innodb_zip/disabled.def
+++ b/mysql-test/suite/innodb_zip/disabled.def
@@ -1 +1 @@
-cmp_per_index: MDEV-11629
+
diff --git a/mysql-test/suite/innodb_zip/r/cmp_per_index.result b/mysql-test/suite/innodb_zip/r/cmp_per_index.result
index 5b899e9ff71..b380071c623 100644
--- a/mysql-test/suite/innodb_zip/r/cmp_per_index.result
+++ b/mysql-test/suite/innodb_zip/r/cmp_per_index.result
@@ -39,13 +39,13 @@ BEGIN;
COMMIT;
ALTER TABLE t DROP INDEX c;
GRANT USAGE ON *.* TO 'tuser01'@'localhost' IDENTIFIED BY 'cDJvI9s_Uq';
-Warnings:
-Level Warning
-Code 1287
-Message Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
FLUSH PRIVILEGES;
+connect con1,localhost,tuser01,cDJvI9s_Uq,;
+connection con1;
SELECT * FROM information_schema.innodb_cmp_per_index;
ERROR 42000: Access denied; you need (at least one of) the PROCESS privilege(s) for this operation
+connection default;
+disconnect con1;
DROP USER 'tuser01'@'localhost';
SELECT
database_name,
@@ -70,7 +70,6 @@ index_name PRIMARY
compress_ops 65
compress_ops_ok 65
uncompress_ops 0
-# restart
SET GLOBAL innodb_cmp_per_index_enabled=ON;
SELECT COUNT(*) FROM t;
COUNT(*) 128
@@ -86,9 +85,15 @@ FROM information_schema.innodb_cmp_per_index
ORDER BY 1, 2, 3;
database_name test
table_name t
+index_name b
+compress_ops 0
+compress_ops_ok 0
+uncompress_ops 6
+database_name test
+table_name t
index_name PRIMARY
compress_ops 0
compress_ops_ok 0
-uncompress_ops 9
+uncompress_ops 5
DROP TABLE t;
SET GLOBAL innodb_cmp_per_index_enabled=default;
diff --git a/mysql-test/suite/innodb_zip/t/cmp_per_index.opt b/mysql-test/suite/innodb_zip/t/cmp_per_index.opt
new file mode 100644
index 00000000000..a031a64fc6c
--- /dev/null
+++ b/mysql-test/suite/innodb_zip/t/cmp_per_index.opt
@@ -0,0 +1,2 @@
+--innodb_log_compressed_pages=on
+--innodb_cmp_per_index_reset