Percona Server moved to https://jira.percona.com/projects/PS

Merge lp:~stewart/percona-server/5.5-fix-innodb-shm-test into lp:percona-server/5.5

  1. 5.5-fix-innodb-shm-test
  2. Merge into 5.5
Proposed by Stewart Smith
Status: Merged
Approved by: Stewart Smith
Approved revision: no longer in the source branch.
Merged at revision: 127
Proposed branch: lp:~stewart/percona-server/5.5-fix-innodb-shm-test
Merge into: lp:percona-server/5.5
Diff against target: 34 lines (+0/-20)
2 files modified
mysql-test/percona_innodb_buffer_pool_shm.result (+0/-4)
mysql-test/percona_innodb_buffer_pool_shm.test (+0/-16)
To merge this branch: bzr merge lp:~stewart/percona-server/5.5-fix-innodb-shm-test
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) Approve
Review via email: mp+65435@code.launchpad.net

Description of the change

fix up innodb_buffer_pool_shm test so that it only tests compatibility of the server option, as the functionality has now been removed.

To post a comment you must log in.
Revision history for this message
Stewart Smith (stewart) wrote :

http://jenkins.percona.com/view/Percona%20Server%205.5/job/percona-server-5.5-param/13/

Revision history for this message
Laurynas Biveinis (laurynas-biveinis) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'mysql-test/percona_innodb_buffer_pool_shm.result'
2--- mysql-test/percona_innodb_buffer_pool_shm.result 2011-01-13 04:34:53 +0000
3+++ mysql-test/percona_innodb_buffer_pool_shm.result 2011-06-22 03:02:19 +0000
4@@ -2,7 +2,3 @@
5 Variable_name Value
6 innodb_buffer_pool_shm_checksum ON
7 innodb_buffer_pool_shm_key 123456
8-show variables like 'innodb_buffer_pool_shm%';
9-Variable_name Value
10-innodb_buffer_pool_shm_checksum ON
11-innodb_buffer_pool_shm_key 123456
12
13=== modified file 'mysql-test/percona_innodb_buffer_pool_shm.test'
14--- mysql-test/percona_innodb_buffer_pool_shm.test 2010-12-09 18:30:58 +0000
15+++ mysql-test/percona_innodb_buffer_pool_shm.test 2011-06-22 03:02:19 +0000
16@@ -1,18 +1,2 @@
17 --source include/have_innodb.inc
18 show variables like 'innodb_buffer_pool_shm%';
19-
20-#clean shutdown (restart_mysqld.inc is not clean if over 10 sec...)
21---write_file $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
22-wait
23-EOF
24-shutdown_server 120;
25---append_file $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
26-restart
27-EOF
28---enable_reconnect
29---source include/wait_until_connected_again.inc
30---disable_reconnect
31-
32-show variables like 'innodb_buffer_pool_shm%';
33---sleep 1
34---system ipcrm -M 123456

Subscribers

People subscribed via source and target branches