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

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

  1. 5.1_fix_bug_862252
  2. Merge into 5.1
Proposed by Oleg Tsarev
Status: Merged
Approved by: Alexey Kopytov
Approved revision: no longer in the source branch.
Merged at revision: 299
Proposed branch: lp:~tsarev/percona-server/5.1_fix_bug_862252
Merge into: lp:percona-server/5.1
Diff against target: 11 lines (+1/-0)
1 file modified
Makefile (+1/-0)
To merge this branch: bzr merge lp:~tsarev/percona-server/5.1_fix_bug_862252
Reviewer Review Type Date Requested Status
Alexey Kopytov (community) Approve
Review via email: mp+77518@code.launchpad.net

This proposal supersedes a proposal from 2011-09-29.

Description of the change

Fixed bug #862252.
On "make prepare", after mysql tarball unpack I removed the mysql-test/mtr and mysql-test/mysql-test-run and create instead of them symlinks to mysql-test/mysql-test-run.pl
This MP required as prerequisite for bug #838725

To post a comment you must log in.
Revision history for this message
Alexey Kopytov (akopytov) wrote : Posted in a previous version of this proposal

Normally (after building from a Bazaar tree) 'mtr' and 'mysql-test-run' are symlinks to 'mysql-test-run.pl', not the other way around.

And you don't have to create symlinks. They are created automatically, check Makefile.am/CMakeLists.txt in mysql-test/. This one should do the trick:

@@ -45,6 +45,7 @@
  ln -s $(PERCONA_SERVER) $(PERCONA_SERVER_SHORT_2)
  ln -s ../patches $(PERCONA_SERVER)/patches
  ln -s ../quiltrc $(PERCONA_SERVER)/quiltrc
+ cd $(PERCONA_SERVER)/mysql-test && rm mysql-test-run mtr

review: Needs Fixing
Revision history for this message
Alexey Kopytov (akopytov) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile'
2--- Makefile 2011-09-06 08:23:51 +0000
3+++ Makefile 2011-09-29 12:52:29 +0000
4@@ -45,6 +45,7 @@
5 ln -s $(PERCONA_SERVER) $(PERCONA_SERVER_SHORT_2)
6 ln -s ../patches $(PERCONA_SERVER)/patches
7 ln -s ../quiltrc $(PERCONA_SERVER)/quiltrc
8+ (cd $(PERCONA_SERVER)/mysql-test && rm mtr mysql-test-run)
9
10 main: prepare
11 (cd $(PERCONA_SERVER) && ../apply_patches)

Subscribers

People subscribed via source and target branches