diff options
| author | Sergey Vojtovich <svoj@mariadb.org> | 2015-03-18 15:25:34 +0400 |
|---|---|---|
| committer | Sergey Vojtovich <svoj@mariadb.org> | 2015-03-18 15:25:34 +0400 |
| commit | a471b7098f50e21565ce4c86efcb05d8310e1d62 (patch) | |
| tree | eddd95897990c75f49feaff8769924a49dbdc130 | |
| parent | 5e6905bb7f1c80e5cc368bb917f6e15afc73a269 (diff) | |
| download | mariadb-git-a471b7098f50e21565ce4c86efcb05d8310e1d62.tar.gz | |
Fixed innodb and innodb_bug59641 failures on PPC64.
innodb_buffer_pool_pages_total depends on page size. On Power8 it is 65k
compared to 4k on Intel. As we round allocations on page size we may get
slightly more memory for buffer pool.
Sort XA RECOVER as rows order depend on endianness.
| -rw-r--r-- | mysql-test/suite/innodb/r/innodb_bug59641.result | 2 | ||||
| -rw-r--r-- | mysql-test/suite/innodb/t/innodb.test | 2 | ||||
| -rw-r--r-- | mysql-test/suite/innodb/t/innodb_bug59641.test | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/mysql-test/suite/innodb/r/innodb_bug59641.result b/mysql-test/suite/innodb/r/innodb_bug59641.result index 476385fba6c..9c5d363e5fe 100644 --- a/mysql-test/suite/innodb/r/innodb_bug59641.result +++ b/mysql-test/suite/innodb/r/innodb_bug59641.result @@ -42,9 +42,9 @@ a b COMMIT; XA RECOVER; formatID gtrid_length bqual_length data -1 3 0 789 1 3 0 123 1 3 0 456 +1 3 0 789 XA ROLLBACK '123'; XA ROLLBACK '456'; XA COMMIT '789'; diff --git a/mysql-test/suite/innodb/t/innodb.test b/mysql-test/suite/innodb/t/innodb.test index 44e75988d16..47bbc90f955 100644 --- a/mysql-test/suite/innodb/t/innodb.test +++ b/mysql-test/suite/innodb/t/innodb.test @@ -1315,7 +1315,7 @@ drop table t1; # Test for testable InnoDB status variables. This test # uses previous ones(pages_created, rows_deleted, ...). ---replace_result 511 ok 512 ok 2047 ok 513 ok 515 ok +--replace_result 511 ok 512 ok 2047 ok 513 ok 514 ok 515 ok SELECT variable_value FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_buffer_pool_pages_total'; SELECT variable_value FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_page_size'; SELECT variable_value - @innodb_rows_deleted_orig FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_rows_deleted'; diff --git a/mysql-test/suite/innodb/t/innodb_bug59641.test b/mysql-test/suite/innodb/t/innodb_bug59641.test index a8d35cd1029..bca3f4a92c1 100644 --- a/mysql-test/suite/innodb/t/innodb_bug59641.test +++ b/mysql-test/suite/innodb/t/innodb_bug59641.test @@ -62,6 +62,7 @@ COMMIT; SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED; SELECT * FROM t; COMMIT; +--sorted_result XA RECOVER; XA ROLLBACK '123'; XA ROLLBACK '456'; |