Merge lp:~ignacio-nin/percona-server/5.5-bug1222777 into lp:percona-server/5.5
Proposed by
Ignacio Nin
Status: | Work in progress |
---|---|
Proposed branch: | lp:~ignacio-nin/percona-server/5.5-bug1222777 |
Merge into: | lp:percona-server/5.5 |
Diff against target: |
323 lines (+25/-25) 25 files modified
Percona-Server/plugin/percona-pam-for-mysql/CMakeLists.txt (+1/-1) Percona-Server/plugin/percona-pam-for-mysql/Makefile.am (+1/-1) Percona-Server/plugin/percona-pam-for-mysql/bootstrap (+1/-1) Percona-Server/plugin/percona-pam-for-mysql/build/build-binary.sh.in (+1/-1) Percona-Server/plugin/percona-pam-for-mysql/build/percona-pam-plugin.spec.in (+1/-1) Percona-Server/plugin/percona-pam-for-mysql/configure.ac (+1/-1) Percona-Server/plugin/percona-pam-for-mysql/src/Makefile.am (+1/-1) Percona-Server/plugin/percona-pam-for-mysql/src/auth_mapping.c (+1/-1) Percona-Server/plugin/percona-pam-for-mysql/src/auth_mapping.h (+1/-1) Percona-Server/plugin/percona-pam-for-mysql/src/auth_pam.c (+1/-1) Percona-Server/plugin/percona-pam-for-mysql/src/auth_pam_common.c (+1/-1) Percona-Server/plugin/percona-pam-for-mysql/src/auth_pam_common.h (+1/-1) Percona-Server/plugin/percona-pam-for-mysql/src/auth_pam_compat.c (+1/-1) Percona-Server/plugin/percona-pam-for-mysql/src/groups.c (+1/-1) Percona-Server/plugin/percona-pam-for-mysql/src/groups.h (+1/-1) Percona-Server/plugin/percona-pam-for-mysql/src/lib_auth_pam_client.c (+1/-1) Percona-Server/plugin/percona-pam-for-mysql/src/lib_auth_pam_client.h (+1/-1) Percona-Server/plugin/percona-pam-for-mysql/src/test_auth_pam_client.c (+1/-1) Percona-Server/sql/threadpool.h (+1/-1) Percona-Server/sql/threadpool_common.cc (+1/-1) Percona-Server/sql/threadpool_unix.cc (+1/-1) Percona-Server/sql/threadpool_win.cc (+1/-1) Percona-Server/storage/heap/hp_dspace.c (+1/-1) Percona-Server/storage/heap/hp_record.c (+1/-1) python-for-subunit2junitxml/subunit/tests/TestUtil.py (+1/-1) |
To merge this branch: | bzr merge lp:~ignacio-nin/percona-server/5.5-bug1222777 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Alexey Kopytov (community) | Needs Fixing | ||
Review via email: mp+184634@code.launchpad.net |
To post a comment you must log in.
Unmerged revisions
- 555. 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
Same comments about log0online.* as in the 5.1 MP +
- percona- pam-for- mysql is a "bzr join"ed upstream branch, so it's better fixed in lp:percona-pam-for-mysql
- threadpool is MariaDB's code, but it's not "joined" and is not merged regularly either, so I think it's OK to fix it in our tree