Merge lp:~ignacio-nin/percona-server/5.1-bug1222777 into lp:percona-server/5.1
Proposed by
Ignacio Nin
Status: | Work in progress |
---|---|
Proposed branch: | lp:~ignacio-nin/percona-server/5.1-bug1222777 |
Merge into: | lp:percona-server/5.1 |
Diff against target: |
437 lines (+34/-34) 33 files modified
Percona-Server/include/atomic/gcc_builtins.h (+1/-1) Percona-Server/include/atomic/generic-msvc.h (+1/-1) Percona-Server/include/atomic/nolock.h (+1/-1) Percona-Server/include/atomic/rwlock.h (+1/-1) Percona-Server/include/atomic/solaris.h (+1/-1) Percona-Server/include/atomic/x86-gcc.h (+1/-1) Percona-Server/include/my_atomic.h (+1/-1) Percona-Server/mysys/my_atomic.c (+1/-1) Percona-Server/sql/patch_info.h.pl (+1/-1) build/debian/patches/01_MAKEFILES__Docs_Images_Makefile.in.dpatch (+1/-1) build/debian/patches/01_MAKEFILES__Docs_Makefile.in.dpatch (+1/-1) build/debian/patches/60_usr_share_mysql_mysql_test.dpatch (+1/-1) kewpie/sql-bench/COPYING (+2/-2) kewpie/sql-bench/Makefile.am (+1/-1) kewpie/sql-bench/Makefile.in (+1/-1) kewpie/sql-bench/as3ap (+1/-1) kewpie/sql-bench/bench-count-distinct (+1/-1) kewpie/sql-bench/bench-init.pl (+1/-1) kewpie/sql-bench/compare-results (+1/-1) kewpie/sql-bench/copy-db (+1/-1) kewpie/sql-bench/crash-me (+1/-1) kewpie/sql-bench/run-all-tests (+1/-1) kewpie/sql-bench/server-cfg (+1/-1) kewpie/sql-bench/test-ATIS (+1/-1) kewpie/sql-bench/test-alter-table (+1/-1) kewpie/sql-bench/test-big-tables (+1/-1) kewpie/sql-bench/test-connect (+1/-1) kewpie/sql-bench/test-create (+1/-1) kewpie/sql-bench/test-insert (+1/-1) kewpie/sql-bench/test-select (+1/-1) kewpie/sql-bench/test-transactions (+1/-1) kewpie/sql-bench/test-wisconsin (+1/-1) python-for-subunit2junitxml/subunit/tests/TestUtil.py (+1/-1) |
To merge this branch: | bzr merge lp:~ignacio-nin/percona-server/5.1-bug1222777 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Alexey Kopytov (community) | Needs Fixing | ||
Review via email: mp+184635@code.launchpad.net |
To post a comment you must log in.
Unmerged revisions
- 578. By Ignacio Nin
-
Update FSF's street address
The copyright notices were showing an outdated FSF's street address.
Update to the new address as per http://www.gnu. org/licenses/ gpl-2.0. html
Ignacio,
include/atomic/* files are upstream, I don't think we should modify upstream copyright notices.
Same about kewpie -- that's an upstream project, or even multiple upstream projects, so let's keep them intact.
And this patch is also missing log0online.h and log0online.c (there's a line break in the street address, so it may not show up in grep).