diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-02-28 23:56:17 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-02-28 23:56:17 +0100 |
| commit | 9d72bbf84ccfe6b671cc5aa72109b0025929399e (patch) | |
| tree | fe2a9ddd264a5961c6ada52e9ae48f61977d36e2 /mysql-test | |
| parent | 213f1c76a038ad0e6111cd5eb6b0da9b4b9dc45a (diff) | |
| parent | a9f12c27c3b260f79ff0d28df8d2006ebea84b3a (diff) | |
| download | mariadb-git-9d72bbf84ccfe6b671cc5aa72109b0025929399e.tar.gz | |
merge with XtraDB as of Percona-Server-5.5.29-rel30.0
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/suite/sys_vars/r/innodb_max_changed_pages_basic.result (renamed from mysql-test/suite/sys_vars/r/innodb_changed_pages_limit_basic.result) | 0 | ||||
| -rw-r--r-- | mysql-test/suite/sys_vars/t/innodb_max_changed_pages_basic.test (renamed from mysql-test/suite/sys_vars/t/innodb_changed_pages_limit_basic.test) | 0 | ||||
| -rw-r--r-- | mysql-test/t/information_schema_all_engines-master.opt | 3 |
3 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/suite/sys_vars/r/innodb_changed_pages_limit_basic.result b/mysql-test/suite/sys_vars/r/innodb_max_changed_pages_basic.result index d9d067c2cf9..d9d067c2cf9 100644 --- a/mysql-test/suite/sys_vars/r/innodb_changed_pages_limit_basic.result +++ b/mysql-test/suite/sys_vars/r/innodb_max_changed_pages_basic.result diff --git a/mysql-test/suite/sys_vars/t/innodb_changed_pages_limit_basic.test b/mysql-test/suite/sys_vars/t/innodb_max_changed_pages_basic.test index 00aa476e8d2..00aa476e8d2 100644 --- a/mysql-test/suite/sys_vars/t/innodb_changed_pages_limit_basic.test +++ b/mysql-test/suite/sys_vars/t/innodb_max_changed_pages_basic.test diff --git a/mysql-test/t/information_schema_all_engines-master.opt b/mysql-test/t/information_schema_all_engines-master.opt index 085c81d34bb..0a9fa574e49 100644 --- a/mysql-test/t/information_schema_all_engines-master.opt +++ b/mysql-test/t/information_schema_all_engines-master.opt @@ -2,9 +2,10 @@ --loose-innodb-buffer-pool-pages --loose-innodb-buffer-pool-pages-blob --loose-innodb-buffer-pool-pages-index +--loose-innodb-changed-pages --loose-innodb-cmp ---loose-innodb-cmpmem-reset --loose-innodb-cmp-reset +--loose-innodb-cmpmem-reset --loose-innodb-index-stats --loose-innodb-lock-waits --loose-innodb-rseg |