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

Merge lp:~stewart/percona-server/quilt-5.5 into lp:percona-server/5.5

  1. quilt-5.5
  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: 142
Proposed branch: lp:~stewart/percona-server/quilt-5.5
Merge into: lp:percona-server/5.5
Diff against target: 109 lines (+18/-2)
4 files modified
Makefile (+2/-1)
apply_patches (+12/-0)
install_tests.sh (+1/-1)
quiltrc (+3/-0)
To merge this branch: bzr merge lp:~stewart/percona-server/quilt-5.5
Reviewer Review Type Date Requested Status
Oleg Tsarev (community) Needs Fixing
Laurynas Biveinis (community) Approve
Review via email: mp+68895@code.launchpad.net

Description of the change

switch to using quilt for patch management. has fallback, exactly the same as 5.1 branch, but for 5.5

http://jenkins.percona.com/job/percona-server-5.5-param/54/

To post a comment you must log in.
Revision history for this message
Laurynas Biveinis (laurynas-biveinis) wrote :

The patch removes "patch < handlersocket.patch" with no apparent replacement. How is handlersocket.patch handled?

Revision history for this message
Stewart Smith (stewart) wrote :

that is a bug. fixing.

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

LGTM

review: Approve
Revision history for this message
Oleg Tsarev (tsarev) wrote :

https://code.launchpad.net/~tsarev/percona-server/quilt-5.1/+merge/69221
The same. Preparing fix.

review: Needs Fixing
Revision history for this message
Oleg Tsarev (tsarev) wrote :

> https://code.launchpad.net/~tsarev/percona-server/quilt-5.1/+merge/69221
> The same. Preparing fix.
Fixes available:
https://code.launchpad.net/~tsarev/percona-server/quilt-5.5/+merge/69231

review: Needs Fixing
Revision history for this message
Oleg Tsarev (tsarev) wrote :

Finally:
https://code.launchpad.net/~tsarev/percona-server/quilt-5.5-1/+merge/69432
https://code.launchpad.net/~tsarev/percona-server/quilt-5.5-2/+merge/69435

review: Needs Fixing

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile'
2--- Makefile 2011-06-28 06:56:52 +0000
3+++ Makefile 2011-07-25 14:59:29 +0000
4@@ -78,7 +78,8 @@
5 mv mysql-$(MYSQL_VERSION) $(PERCONA_SERVER)
6 ln -s $(PERCONA_SERVER) $(PERCONA_SERVER_SHORT_1)
7 ln -s $(PERCONA_SERVER) $(PERCONA_SERVER_SHORT_2)
8- (cat `cat $(SERIES)`) | patch -p1 -d $(PERCONA_SERVER)
9+ ln -s ../patches $(PERCONA_SERVER)/patches
10+ (cd $(PERCONA_SERVER) && ../apply_patches)
11 rm $(PERCONA_SERVER)/sql/sql_yacc.cc $(PERCONA_SERVER)/sql/sql_yacc.h
12
13 mysql-$(MYSQL_VERSION).tar.gz:
14
15=== added file 'apply_patches'
16--- apply_patches 1970-01-01 00:00:00 +0000
17+++ apply_patches 2011-07-25 14:59:29 +0000
18@@ -0,0 +1,12 @@
19+#!/bin/bash
20+
21+if [ `which quilt` ]; then
22+ echo; echo 'Using quilt'; echo
23+ quilt push -a
24+else
25+ echo; echo 'WARNING: Not using quilt, not suitable for dev environment';
26+ echo;
27+ PS_DIR=$PWD
28+ (cd patches; cat `cat series`) | patch -p1 -d $PS_DIR
29+fi
30+
31
32=== modified file 'install_tests.sh'
33--- install_tests.sh 2011-06-21 17:08:45 +0000
34+++ install_tests.sh 2011-07-25 14:59:29 +0000
35@@ -28,7 +28,7 @@
36 test -d $1 && do_install_path $1 $2
37 }
38 current=0;
39-count=`wc -l series`;
40+count=`wc -l patches/series`;
41 install_path mysql-test "global" $current $count
42 for test_name in `cat series`; do
43 current=$((current+1));
44
45=== added directory 'patches'
46=== renamed file 'bug580324.patch' => 'patches/bug580324.patch'
47=== renamed file 'bug813587.patch' => 'patches/bug813587.patch'
48=== renamed file 'control_online_alter_index.patch' => 'patches/control_online_alter_index.patch'
49=== renamed file 'error_pad.patch' => 'patches/error_pad.patch'
50=== renamed file 'file-contents.patch' => 'patches/file-contents.patch'
51=== renamed file 'innodb_adaptive_hash_index_partitions.patch' => 'patches/innodb_adaptive_hash_index_partitions.patch'
52=== renamed file 'innodb_admin_command_base.patch' => 'patches/innodb_admin_command_base.patch'
53=== renamed file 'innodb_buffer_pool_pages_i_s.patch' => 'patches/innodb_buffer_pool_pages_i_s.patch'
54=== renamed file 'innodb_buffer_pool_shm.patch' => 'patches/innodb_buffer_pool_shm.patch'
55=== renamed file 'innodb_bug60788.patch' => 'patches/innodb_bug60788.patch'
56=== renamed file 'innodb_deadlock_count.patch' => 'patches/innodb_deadlock_count.patch'
57=== renamed file 'innodb_dict_size_limit.patch' => 'patches/innodb_dict_size_limit.patch'
58=== renamed file 'innodb_expand_fast_index_creation.patch' => 'patches/innodb_expand_fast_index_creation.patch'
59=== renamed file 'innodb_expand_import.patch' => 'patches/innodb_expand_import.patch'
60=== renamed file 'innodb_extend_slow.patch' => 'patches/innodb_extend_slow.patch'
61=== renamed file 'innodb_extra_rseg.patch' => 'patches/innodb_extra_rseg.patch'
62=== renamed file 'innodb_fake_changes.patch' => 'patches/innodb_fake_changes.patch'
63=== renamed file 'innodb_fast_checksum.patch' => 'patches/innodb_fast_checksum.patch'
64=== renamed file 'innodb_files_extend.patch' => 'patches/innodb_files_extend.patch'
65=== renamed file 'innodb_fix_misc.patch' => 'patches/innodb_fix_misc.patch'
66=== renamed file 'innodb_io_patches.patch' => 'patches/innodb_io_patches.patch'
67=== renamed file 'innodb_lru_dump_restore.patch' => 'patches/innodb_lru_dump_restore.patch'
68=== renamed file 'innodb_opt_lru_count.patch' => 'patches/innodb_opt_lru_count.patch'
69=== renamed file 'innodb_overwrite_relay_log_info.patch' => 'patches/innodb_overwrite_relay_log_info.patch'
70=== renamed file 'innodb_pass_corrupt_table.patch' => 'patches/innodb_pass_corrupt_table.patch'
71=== renamed file 'innodb_recovery_patches.patch' => 'patches/innodb_recovery_patches.patch'
72=== renamed file 'innodb_separate_doublewrite.patch' => 'patches/innodb_separate_doublewrite.patch'
73=== renamed file 'innodb_show_lock_name.patch' => 'patches/innodb_show_lock_name.patch'
74=== renamed file 'innodb_show_status.patch' => 'patches/innodb_show_status.patch'
75=== renamed file 'innodb_show_status_extend.patch' => 'patches/innodb_show_status_extend.patch'
76=== renamed file 'innodb_show_sys_tables.patch' => 'patches/innodb_show_sys_tables.patch'
77=== renamed file 'innodb_split_buf_pool_mutex.patch' => 'patches/innodb_split_buf_pool_mutex.patch'
78=== renamed file 'innodb_stats.patch' => 'patches/innodb_stats.patch'
79=== renamed file 'innodb_thread_concurrency_timer_based.patch' => 'patches/innodb_thread_concurrency_timer_based.patch'
80=== renamed file 'log_connection_error.patch' => 'patches/log_connection_error.patch'
81=== renamed file 'log_warnings_suppress.patch' => 'patches/log_warnings_suppress.patch'
82=== renamed file 'memory_dynamic_rows.patch' => 'patches/memory_dynamic_rows.patch'
83=== renamed file 'microsec_process.patch' => 'patches/microsec_process.patch'
84=== renamed file 'mysql-test.diff' => 'patches/mysql-test.diff'
85=== renamed file 'mysql_dump_ignore_ct.patch' => 'patches/mysql_dump_ignore_ct.patch'
86=== renamed file 'mysql_remove_eol_carret.patch' => 'patches/mysql_remove_eol_carret.patch'
87=== renamed file 'mysql_syslog.patch' => 'patches/mysql_syslog.patch'
88=== renamed file 'optimizer_fix.patch' => 'patches/optimizer_fix.patch'
89=== renamed file 'percona_support.patch' => 'patches/percona_support.patch'
90=== renamed file 'processlist_row_stats.patch' => 'patches/processlist_row_stats.patch'
91=== renamed file 'query_cache_enhance.patch' => 'patches/query_cache_enhance.patch'
92=== renamed file 'remove_fcntl_excessive_calls.patch' => 'patches/remove_fcntl_excessive_calls.patch'
93=== renamed file 'response_time_distribution.patch' => 'patches/response_time_distribution.patch'
94=== renamed file 'series' => 'patches/series'
95=== renamed file 'show_slave_status_nolock.patch' => 'patches/show_slave_status_nolock.patch'
96=== renamed file 'show_temp.patch' => 'patches/show_temp.patch'
97=== renamed file 'slave_timeout_fix.patch' => 'patches/slave_timeout_fix.patch'
98=== renamed file 'slow_extended.patch' => 'patches/slow_extended.patch'
99=== renamed file 'sql_no_fcache.patch' => 'patches/sql_no_fcache.patch'
100=== renamed file 'start-stop-messages.patch' => 'patches/start-stop-messages.patch'
101=== renamed file 'userstat.patch' => 'patches/userstat.patch'
102=== renamed file 'utf8_general50_ci.patch' => 'patches/utf8_general50_ci.patch'
103=== added file 'quiltrc'
104--- quiltrc 1970-01-01 00:00:00 +0000
105+++ quiltrc 2011-07-25 14:59:29 +0000
106@@ -0,0 +1,3 @@
107+QUILT_NO_DIFF_TIMESTAMPS=1
108+QUILT_NO_DIFF_INDEX=1
109+QUILT_REFRESH_ARGS="-pab"

Subscribers

People subscribed via source and target branches