lp:~raghavendra-prabhu/percona-xtradb-cluster/bug-1104977
- Get this branch:
- bzr branch lp:~raghavendra-prabhu/percona-xtradb-cluster/bug-1104977
Branch merges
- Raghavendra D Prabhu: Pending requested
-
Diff: 77 lines (+7/-2)5 files modifiedbuild/build-binary.sh (+1/-0)
build/build-rpm.sh (+1/-1)
build/build-shared-compat-rpm.sh (+1/-1)
build/debian/rules (+2/-0)
build/percona-xtradb-cluster.spec (+2/-0)
Related bugs
Bug #1104977: Percona Server is still built with yaSSL | Undecided | Fix Released |
Related blueprints
Branch information
- Owner:
- Raghavendra D Prabhu
- Status:
- Development
Recent revisions
- 394. By Raghavendra D Prabhu
-
Bug#1104977: Fix PXC to be built without builtin yaSSL, and linked
against openSSL.As per lp:1104977, building with builtin yaSSL presented certain issues, and
we needed to build with openssl. Hence this commit.Add a -DWITH_SSL=system parameter to cmake so the system openssl is used
instead of the bundled YaSSL implementation. - 393. By Raghavendra D Prabhu
-
Merge fixes of lp:1131102.
This commit adds the policy files of selinux and apparmor to the tree.
- 392. By Raghavendra D Prabhu
-
Merge fixes for lp:1164893 and lp:1162421
Merging fixes from codership for CTAS related issues.
- 391. By Raghavendra D Prabhu
-
Bug#1128906": Merge fix for lp:1128906
This merge fixes the issue lp:1128906 which led to empty wsrep version if PXC
built from source rpm. - 390. By Raghavendra D Prabhu
-
Bug#1158221: Merge lock fixes from codership
This commit merges the fix for an earlier 5.5.30 merge regression which caused a
crash. - 389. By Raghavendra D Prabhu
-
Merge changes for release 5.5.29-27.2 and bugfix for the libmysqlclient conflict.
- 388. By Raghavendra D Prabhu
-
Bug#1000761: Fix various issues with clustercheck script.
Specifically,
Bug:1000761 - Fix the path to clustercheck.
Bug:1035927 - Fix the hanging of check with connect-timeout.
Bug:1132934 - Same as 1000761.
Bug:1158443 - Add a feature to provide arguments to the script.
Also, merging fixes from https:/
/github. com/olafz/ percona- clustercheck - 387. By Raghavendra D Prabhu
-
Fix the merge omission.
A particular #if/#endif was omitted due to oversight in the codership tree,
fixed it now. - 386. By Raghavendra D Prabhu
-
Merge with wsrep 5.5.30 - 23.7.4 from lp:1133146
Merged the PXC code with 5.5.30 wsrep-23.7.4 from
http://bazaar. launchpad. net/~codership/ codership- mysql/5. 5-23/revision/ 3
858.Following conflicts resolved:
Text conflict in Percona-Server/ mysql-test/ lib/mtr_ report. pm
Text conflict in Percona-Server/ scripts/ wsrep_sst_ rsync.sh
Text conflict in Percona-Server/ sql/sql_ class.h
Text conflict in Percona-Server/ storage/ innobase/ buf/buf0buf. c
Text conflict in Percona-Server/ storage/ innobase/ buf/buf0flu. c
Text conflict in Percona-Server/ storage/ innobase/ fil/fil0fil. c
Text conflict in Percona-Server/ storage/ innobase/ handler/ ha_innodb. cc
Text conflict in Percona-Server/ storage/ innobase/ include/ buf0buf. h
Text conflict in Percona-Server/ storage/ innobase/ include/ fil0fil. h
Text conflict in Percona-Server/ storage/ innobase/ include/ lock0lock. h
Text conflict in Percona-Server/ storage/ innobase/ include/ srv0srv. h
Text conflict in Percona-Server/ storage/ innobase/ include/ trx0trx. h
Text conflict in Percona-Server/ storage/ innobase/ include/ univ.i
Text conflict in Percona-Server/ storage/ innobase/ lock/lock0lock. c
Text conflict in Percona-Server/ storage/ innobase/ log/log0recv. c
Text conflict in Percona-Server/ storage/ innobase/ row/row0merge. c
Text conflict in Percona-Server/ storage/ innobase/ srv/srv0srv. c - 385. By Raghavendra D Prabhu
-
Merge with Percona Server 5.5.30.
This merges existing PXC trunk with
lp:~percona-core/percona-server/release-5.5.30-30.1 after resolving following
conflicts:Path conflict: <deleted> / doc-ps/
source/ flexibility/ buff_read_ ahead_area. rst
Path conflict: <deleted> / doc-ps/source/ flexibility/ improved_ memory_ engine. rst
Path conflict: <deleted> / doc-ps/source/ flexibility/ innodb_ files_extend. rst
Text conflict in Percona-Server/ sql/CMakeLists. txt
Text conflict in Percona-Server/ sql/mysqld. cc
Text conflict in Percona-Server/ sql/sql_ connect. cc
Text conflict in Percona-Server/ storage/ innobase/ handler/ ha_innodb. cc
Text conflict in Percona-Server/ storage/ innobase/ include/ lock0lock. h
Text conflict in Percona-Server/ storage/ innobase/ lock/lock0lock. c
Text conflict in build/build-binary. sh
Text conflict in build/debian/control
Text conflict in build/debian/rules
Text conflict in build/percona-xtradb- cluster. spec
Contents conflict in doc-ps/source/ release- notes/release- notes_index. rst
Contents conflict in doc-ps/source/ scalability/ innodb_ io_55.rst
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)