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

Merge lp:~tsarev/percona-server/5.1_fix_bug_794790 into lp:percona-server/5.1

  1. 5.1_fix_bug_794790
  2. Merge into 5.1
Proposed by Oleg Tsarev
Status: Merged
Approved by: Stewart Smith
Approved revision: no longer in the source branch.
Merged at revision: 322
Proposed branch: lp:~tsarev/percona-server/5.1_fix_bug_794790
Merge into: lp:percona-server/5.1
Prerequisite: lp:~tsarev/percona-server/5.1_fix_bug_838725_base
Diff against target: 19 lines (+3/-2)
1 file modified
patches/mysql-test.diff (+3/-2)
To merge this branch: bzr merge lp:~tsarev/percona-server/5.1_fix_bug_794790
Reviewer Review Type Date Requested Status
Stewart Smith (community) Approve
Review via email: mp+78694@code.launchpad.net

Description of the change

NOTE: This branch NOT FOR MERGE, JUST FOR REVIEW

PREREQUISITE BRANCH: https://code.launchpad.net/~tsarev/percona-server/5.1_fix_bug_838725_base/+merge/78683

FAILED TESTS:
1. main.endspace main.index_merge_innodb main.rowid_order_innodb main.type_bit_innodb
https://code.launchpad.net/~tsarev/percona-server/5.1_fix_bug_832528/+merge/78687

2. main.percona_innodb_kill_idle_trx main.percona_innodb_kill_idle_trx_locks
https://code.launchpad.net/~tsarev/percona-server/fix_for_kill_idle_trx_test/+merge/78691

3. main.percona_server_variables_debug main.percona_server_variables_release
https://code.launchpad.net/~tsarev/percona-server/fix_for_kill_idle_trx_test/+merge/78691
https://code.launchpad.net/~tsarev/percona-server/5.1_fix_bug_860416/+merge/78692

DESCRIPTION:
Commit number 265 has regression (bug #794790 - mtr internal check of INNODB_FILE_FORMAT_CHECK fails in debug builds)
This bug was not found, because commit number 266 (bug #838725) hide this problem (tests with --source include/have_innodb.inc didn't run too)
I retry fix from commit number 250 (fix of bug #794790)

To post a comment you must log in.
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=== modified file 'patches/mysql-test.diff'
2--- patches/mysql-test.diff 2011-10-05 00:02:14 +0000
3+++ patches/mysql-test.diff 2011-10-08 03:41:25 +0000
4@@ -3876,12 +3876,13 @@
5 +--log-output=table,file --log-slow-queries
6 --- a/mysql-test/include/mtr_check.sql
7 +++ b/mysql-test/include/mtr_check.sql
8-@@ -12,7 +12,8 @@
9+@@ -12,7 +12,9 @@
10 -- Dump all global variables except those
11 -- that are supposed to change
12 SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
13 - WHERE variable_name != 'timestamp' ORDER BY VARIABLE_NAME;
14-+ WHERE variable_name != 'timestamp'
15++ WHERE variable_name != 'timestamp' AND
16++ variable_name != 'innodb_file_format_check'
17 + ORDER BY VARIABLE_NAME;
18
19 -- Dump all databases, there should be none

Subscribers

People subscribed via source and target branches