summaryrefslogtreecommitdiff
path: root/sql/wsrep_utils.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge 10.1 into 10.2Marko Mäkelä2019-05-131-1/+1
|\
| * Merge branch '5.5' into 10.1Vicențiu Ciorbaru2019-05-111-1/+1
| * MDEV-10442: "Address already in use" on restartNirbhay Choubey2017-12-181-1/+0
* | Merge 10.1 into 10.2Marko Mäkelä2017-08-311-0/+14
|\ \ | |/
| * Merge remote-tracking branch 'origin/10.0-galera' into 10.1Jan Lindström2017-08-211-0/+14
| |\
| | * MW-366 Improved support for IPv6 networks - made mysqld and SST scripts to re...Alexey Yurchenko2017-08-111-0/+15
* | | Merge branch '10.1' into 10.2Sergei Golubchik2017-03-301-1/+1
|\ \ \ | |/ /
| * | Correct FSF addressiangilfillan2017-03-101-1/+1
* | | MDEV-10442: "Address already in use" on restartNirbhay Choubey2016-11-211-1/+0
* | | Reuse THD for new user connectionsMonty2016-06-041-1/+1
|/ /
* | Merge branch 'github/10.0-galera' into 10.1Sergei Golubchik2015-11-191-3/+90
|\ \ | |/
| * This commit fixesAlexey Yurchenko2015-09-091-3/+2
| * Refs codership/mysql-wsrep#141: this commitAlexey Yurchenko2015-09-091-2/+3
| * Merge branch '5.5-galera' into 10.0-galeraNirbhay Choubey2015-09-091-3/+90
| |\
| | * This commit fixesAlexey Yurchenko2015-09-091-4/+3
| | * Refs codership/mysql-wsrep#141: this commitAlexey Yurchenko2015-09-091-3/+91
| | * Refs #25 - made sure signals that may be set to ignored in mysqld were set to...Alexey Yurchenko2015-05-041-1/+29
| | * Changes in wsrep_guess_ip()Nirbhay Choubey2015-02-241-16/+13
| | * Backported changes done in wsrep_guess_ip() from 10.1.Nirbhay Choubey2015-01-261-46/+29
| | * MDEV-6636 : Merged fixes for lp:1167368 and lp:1250805.Nirbhay Choubey2014-08-251-7/+4
| | * Merging revision 3839..3932 from codership-mysql/5.5.Nirbhay Choubey2014-01-091-18/+69
| | * Merge revisions 3907--3914 from lp:~codership/codership-mysql/5.5-23Jan Lindström2013-09-261-1/+1
| | * Merged FreeBSD compatibility changes (up to revision 3893 in lp:~codership/c...Seppo Jaakola2013-08-071-0/+2
| | * References: MDEV-4572 - merge with lp:codership-mysql/5.5-23 revisions 3858.....Seppo Jaakola2013-05-251-4/+2
| | * merged with codership-mysql up to revision 3839Seppo Jaakola2013-02-051-2/+3
| | * remerging wsrep files from lp:codership-mysqlSeppo Jaakola2013-02-051-0/+467
| | * re-merging wsrep files from lp:codership-mysqlSeppo Jaakola2013-02-051-468/+0
| | * References: lp:1066784 - Merged revisions 3810-3827 from lp:codership-mysqlSeppo Jaakola2012-11-281-2/+3
| | * Merged in change sets 3772-3779 from lp:codership-mysql/5.5mariadb-galera-5.5.25Seppo Jaakola2012-08-301-39/+58
| | * References lp:1034621 - Merge up to mysql-5.5.25 levelSeppo Jaakola2012-08-091-1/+2
| | * Merged changes from lp:codership-mysql up to rev 3743Seppo Jaakola2012-04-261-1/+1
| | * Added wsrep specific filesSeppo Jaakola2012-04-261-0/+447
| * Refs codership/mysql-wsrep#33Alexey Yurchenko2015-05-081-56/+1
| * Refs #25 - made sure signals that may be set to ignored in mysqld were set to...Alexey Yurchenko2015-05-081-1/+29
| * Changes in wsrep_guess_ip()Nirbhay Choubey2015-02-271-16/+13
* | MDEV-8975: 10.1 Fails To Join Existing Galera ClusterNirbhay Choubey2015-11-051-1/+2
* | MDEV-8034 : wsrep_node_address can't be IPV6Nirbhay Choubey2015-09-151-29/+48
* | Merge branch '10.0-galera' into 10.1Nirbhay Choubey2015-07-141-56/+30
* | Changes in wsrep_guess_ip()Nirbhay Choubey2015-02-271-16/+13
* | Merge 10.0-galera into 10.1Sergei Golubchik2015-02-061-6/+3
|\ \ | |/
| * Backported changes done in wsrep_guess_ip() from 10.1.Nirbhay Choubey2015-01-261-48/+25
| * Merged patch for lp:1167368 from maria-5.5-galera.Nirbhay Choubey2014-12-081-4/+2
| * MDEV-7131: [PATCH] wsrep_guess_ip doesn't compile on OpenBSDNirbhay Choubey2014-11-191-1/+1
| * Merging revision from codership-mysql/5.5 (r3928..3968) andNirbhay Choubey2014-03-271-1/+4
| |\
| | * bzr merge -r4062..4065 codership/5.6Nirbhay Choubey2014-03-261-3/+2
| |/
| * merge with MariaDB 5.6 bzr merge lp:maria --rtag:mariadb-10.0.6Seppo Jaakola2013-12-041-4/+6
| * bzr merge -r3895..3903 lp:codership-mysql/5.5 Seppo Jaakola2013-11-261-1/+1
| * Merges from lp:codership-mysql/5.5 up to rev #3893, this changes to wsrep API...Seppo Jaakola2013-11-261-19/+66
| * bzr merge -r3890..3891 lp:codership-mysql/5.5Seppo Jaakola2013-11-061-0/+4
| * Merged revisions 3418..3424 from mariadb-galera-5.5Seppo Jaakola2013-10-071-1/+1