summaryrefslogtreecommitdiff
path: root/sql/wsrep_mysqld.h
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2017-05-051-0/+1
|\
| * Merge 10.1 into 10.2Marko Mäkelä2017-04-281-0/+1
| |\
| | * MW-329 Fix incorrect affected rows count after replaySachin Setiya2017-04-061-0/+1
* | | Changing field::field_name and Item::name to LEX_CSTRINGMonty2017-04-231-1/+1
|/ /
* | Merge branch '10.1' into 10.2Sergei Golubchik2017-03-301-1/+1
|\ \ | |/
| * Correct FSF addressiangilfillan2017-03-101-1/+1
* | Merge 10.1 to 10.2Marko Mäkelä2017-01-051-1/+1
|\ \ | |/
| * MDEV-7955 WSREP() appears on radar in OLTP ROSachin Setiya2017-01-031-1/+1
| * MDEV-11479 Improved wsrep_dirty_readsSachin Setiya2016-12-141-0/+1
|/
* Post merge fixes.Nirbhay Choubey2016-08-251-0/+3
* Merge branch '10.0-galera' into bb-10.1-sergNirbhay Choubey2016-08-251-2/+7
|\
| * refs: MW-279sjaakola2016-08-211-2/+4
| * Refs MW-252sjaakola2016-08-211-0/+1
| * Refs MW-252sjaakola2016-08-211-0/+1
* | Code cleanup (wsrep patch).Nirbhay Choubey2016-06-271-5/+0
* | Merge branch '10.0-galera' into bb-10.1-sergNirbhay Choubey2016-02-241-0/+2
|\ \ | |/
| * refs codership/mysql-wsrep#201Daniele Sciascia2016-02-221-0/+1
* | MDEV-8208 Sporadic SEGFAULT on startupSergei Golubchik2016-01-251-2/+0
* | Merge branch 'github/10.0-galera' into 10.1Sergei Golubchik2015-12-221-2/+0
|\ \ | |/
| * MDEV-9162 : MariaDB Galera Cluster memory leak on async slave nodeNirbhay Choubey2015-12-141-2/+1
* | Merge branch 'github/10.0-galera' into 10.1Sergei Golubchik2015-11-191-1/+2
|\ \ | |/
| * Merge branch '5.5-galera' into 10.0-galeraNirbhay Choubey2015-09-251-0/+1
| |\
| | * MDEV-8208: Sporadic SEGFAULT on startupNirbhay Choubey2015-09-161-0/+1
| | * bzr merge -r4015..4026 codership/5.5Nirbhay Choubey2014-10-091-1/+1
| | * Merged r4014 from codership/5.5Nirbhay Choubey2014-08-121-1/+10
| | * bzr merge -r3997..4010 codership-mysql/5.5Nirbhay Choubey2014-08-061-0/+2
| | * MDEV#6411 - Setting set @@global_wsrep_sst_auth=NULLNirbhay Choubey2014-07-091-1/+1
| | * bzr merge -r3985..3997 codership/5.5Nirbhay Choubey2014-06-101-0/+1
| | * Merge lp:codership-mysql/5.5 -r3961..3980.Jan Lindström2014-04-161-0/+2
| | * * Merged revisions 3945, 3946..3950, 3951..3961Nirbhay Choubey2014-02-281-4/+5
| | * Merging revision 3839..3932 from codership-mysql/5.5.Nirbhay Choubey2014-01-091-144/+51
| | * * Updated auto_increment_xxx_func.result to reflect the changesNirbhay Choubey2013-12-101-1/+1
| | * MDEV#4109: Galera: Valgrind warnings "blocks are stillNirbhay Choubey2013-11-291-0/+3
| | * MDEV-4222: Assertion `( ((global_system_variables.wsrep_on) &&Nirbhay Choubey2013-11-291-0/+3
| | * Merged revisions 2925--3929 from from lp:~codership/codership-mysql/5.5-23Jan Lindström2013-11-251-3/+3
| | * Merge revisions 3907--3914 from lp:~codership/codership-mysql/5.5-23Jan Lindström2013-09-261-0/+6
| | * References: lp:1206129 - Merged revision 3904 from lp:~codership/codership-my...Seppo Jaakola2013-08-231-0/+2
| | * References https://mariadb.atlassian.net/browse/MDEV-4176Seppo Jaakola2013-02-171-1/+1
| | * References lp:1115708 - merged with wsrep branch, revision 3845Seppo Jaakola2013-02-051-1/+3
| | * merged with codership-mysql up to revision 3839Seppo Jaakola2013-02-051-5/+7
| | * remerging wsrep files from lp:codership-mysqlSeppo Jaakola2013-02-051-0/+383
| | * re-merging wsrep files from lp:codership-mysqlSeppo Jaakola2013-02-051-383/+0
| | * References: lp:1066784 - Merged revisions 3810-3827 from lp:codership-mysqlSeppo Jaakola2012-11-281-5/+5
| | * References lp:1066784Seppo Jaakola2012-10-231-0/+88
| | * References lp:1051808 - merged with lp:codership-mysql 5.5.27 based trunkSeppo Jaakola2012-09-171-1/+2
| | * Merged in change sets 3772-3779 from lp:codership-mysql/5.5mariadb-galera-5.5.25Seppo Jaakola2012-08-301-2/+1
| | * References lp:1034621 - Merge up to mysql-5.5.25 levelSeppo Jaakola2012-08-091-1/+7
| | * References lp:1011983Seppo Jaakola2012-06-121-2/+2
| | * Merged changes from lp:codership-mysql up to rev 3743Seppo Jaakola2012-04-261-15/+7
| | * Added wsrep specific filesSeppo Jaakola2012-04-261-0/+297
View Lorry Controller Status