summaryrefslogtreecommitdiff
path: root/sql/wsrep_utils.cc
Commit message (Expand)AuthorAgeFilesLines
* 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
| * Merge 10.0 to galera-10.0Jan Lindström2013-09-031-0/+468
* portability: use getifaddrs()Sergei Golubchik2014-10-011-44/+22
* fixing embedded: WaaS. Wsrep as a Service.Sergei Golubchik2014-10-011-2/+1
* MDEV-6247: Merge 10.0-galera to 10.1.Jan Lindström2014-08-261-0/+524