Merge lp:~laurynas-biveinis/percona-server/BT-16274-bug1108874-5.5 into lp:percona-server/5.5

Proposed by Laurynas Biveinis
Status: Merged
Approved by: Stewart Smith
Approved revision: 412
Merged at revision: 435
Proposed branch: lp:~laurynas-biveinis/percona-server/BT-16274-bug1108874-5.5
Merge into: lp:percona-server/5.5
Diff against target: 51 lines (+42/-0)
2 files modified
Percona-Server/mysql-test/suite/innodb/r/percona_changed_page_bmp_log_block_size.result (+6/-0)
Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp_log_block_size.test (+36/-0)
To merge this branch: bzr merge lp:~laurynas-biveinis/percona-server/BT-16274-bug1108874-5.5
Reviewer Review Type Date Requested Status
Stewart Smith (community) Approve
George Ormond Lorch III g2 Approve
Review via email: mp+145403@code.launchpad.net

Description of the change

To post a comment you must log in.
Revision history for this message
George Ormond Lorch III (gl-az) :
review: Approve (g2)
Revision history for this message
Stewart Smith (stewart) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'Percona-Server/mysql-test/suite/innodb/r/percona_changed_page_bmp_log_block_size.result'
2--- Percona-Server/mysql-test/suite/innodb/r/percona_changed_page_bmp_log_block_size.result 1970-01-01 00:00:00 +0000
3+++ Percona-Server/mysql-test/suite/innodb/r/percona_changed_page_bmp_log_block_size.result 2013-01-29 15:31:48 +0000
4@@ -0,0 +1,6 @@
5+DROP TABLE IF EXISTS t1;
6+call mtr.add_suppression("InnoDB: Warning: innodb_log_block_size has been changed from default value");
7+CREATE TABLE t1 (a INT, b BLOB) ENGINE=InnoDB;
8+INSERT INTO t1 VALUES(1, REPEAT("a", 20000));
9+INSERT INTO t1 VALUES(2, REPEAT("b", 20000));
10+DROP TABLE t1;
11
12=== added file 'Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp_log_block_size.test'
13--- Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp_log_block_size.test 1970-01-01 00:00:00 +0000
14+++ Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp_log_block_size.test 2013-01-29 15:31:48 +0000
15@@ -0,0 +1,36 @@
16+#
17+# Test the combination of changed page tracking and non-default log block size (bug 1108874)
18+#
19+--source include/have_innodb.inc
20+
21+--disable_warnings
22+DROP TABLE IF EXISTS t1;
23+--enable_warnings
24+
25+let $MYSQLD_DATADIR= `select @@datadir`;
26+
27+call mtr.add_suppression("InnoDB: Warning: innodb_log_block_size has been changed from default value");
28+
29+--exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
30+--shutdown_server 10
31+--source include/wait_until_disconnected.inc
32+--remove_files_wildcard $MYSQLD_DATADIR ib_logfile*
33+--enable_reconnect
34+--exec echo "restart:--innodb-log-block-size=4096 --innodb-track-changed-pages=1" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
35+--source include/wait_until_connected_again.inc
36+
37+CREATE TABLE t1 (a INT, b BLOB) ENGINE=InnoDB;
38+
39+INSERT INTO t1 VALUES(1, REPEAT("a", 20000));
40+INSERT INTO t1 VALUES(2, REPEAT("b", 20000));
41+
42+DROP TABLE t1;
43+
44+--exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
45+--shutdown_server 10
46+--source include/wait_until_disconnected.inc
47+--file_exists $MYSQLD_DATADIR/ib_modified_log_1_0.xdb
48+--remove_files_wildcard $MYSQLD_DATADIR ib_logfile*
49+--enable_reconnect
50+--exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
51+--source include/wait_until_connected_again.inc

Subscribers

People subscribed via source and target branches