summaryrefslogtreecommitdiff
path: root/sql/wsrep_hton.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge 10.2 into 10.3Marko Mäkelä2019-05-141-1/+1
|\
| * 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
* | | Merge 10.2 into 10.3Marko Mäkelä2019-03-191-0/+1
|\ \ \ | |/ /
| * | MDEV-17262: mysql crashed on galera while node rejoined cluster (#895)sysprg2019-03-181-0/+1
* | | Merge branch '10.2' into 10.3Sergei Golubchik2018-09-281-2/+7
|\ \ \ | |/ /
| * | Merge branch '10.1' into 10.2Oleksandr Byelkin2018-09-141-2/+7
| |\ \ | | |/
| | * Merge branch '10.0-galera' into 10.1Sergei Golubchik2018-09-071-2/+7
| | |\
| | | * MDEV-16799: Test wsrep.variables crash at sql_class.cc:639 thd_get_ha_dataJan Lindström2018-07-241-7/+14
* | | | Merge branch '10.2' into 10.3Sergei Golubchik2018-06-301-12/+24
|\ \ \ \ | |/ / /
| * | | Merge branch '10.1' into 10.2Sergei Golubchik2018-06-211-12/+24
| |\ \ \ | | |/ /
| | * | Merge branch '10.0-galera' into 10.1Vicențiu Ciorbaru2018-06-121-12/+24
| | |\ \ | | | |/
| | | * Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galeraJan Lindström2018-05-071-13/+25
| | | |\
| | | | * MariaDB adjustments.Jan Lindström2018-04-241-24/+24
| | | | * Provider rollback for ineffective trxTeemu Ollakka2018-04-241-5/+34
| | | | * MDEV-7129 : Galera duplicate error on autoincrement field primary keyNirbhay Choubey2015-01-071-1/+2
| | | | * Merge lp:codership-mysql/5.5 -r3961..3980.Jan Lindström2014-04-161-0/+6
| | | | * * Merged revisions 3945, 3946..3950, 3951..3961Nirbhay Choubey2014-02-281-13/+6
| | | | * Merging revisions 3934..3944 from codership-mysql/5.5.Nirbhay Choubey2014-02-031-2/+7
| | | | * Merging revision 3839..3932 from codership-mysql/5.5.Nirbhay Choubey2014-01-091-92/+81
| | | | * MDEV-5408: Crash in mariadb-wsrep during plugin load at startupJan Lindström2013-12-101-4/+6
| | | | * Merged revisions 2925--3929 from from lp:~codership/codership-mysql/5.5-23Jan Lindström2013-11-251-54/+150
| | | | * Merge revisions 3907--3914 from lp:~codership/codership-mysql/5.5-23Jan Lindström2013-09-261-7/+19
| | | | * Merged with lp:~codership/codership-mysql/5.5-23, up to revision 3903Seppo Jaakola2013-08-211-1/+6
| | | | * References: MDEV-4572 - merge with lp:codership-mysql/5.5-23 revisions 3858.....Seppo Jaakola2013-05-251-0/+1
| | | | * merged in revisions 3853..3857 from lp:codership-mysql/5.5-23Seppo Jaakola2013-05-211-0/+5
| | | | * fixes for the merge with codership-mysql, revision 3839Seppo Jaakola2013-02-051-1/+1
| | | | * merged with codership-mysql up to revision 3839Seppo Jaakola2013-02-051-1/+7
| | | | * remerging wsrep files from lp:codership-mysqlSeppo Jaakola2013-02-051-0/+449
| | | | * re-merging wsrep files from lp:codership-mysqlSeppo Jaakola2013-02-051-449/+0
| | | | * References lp:1066784Seppo Jaakola2012-10-231-0/+9
| | | | * References lp:1034621 - Merge up to mysql-5.5.25 levelSeppo Jaakola2012-08-091-1/+1
| | | | * References lp:1011983Seppo Jaakola2012-06-121-2/+9
| | | | * Merged changes from lp:codership-mysql up to rev 3743Seppo Jaakola2012-04-261-3/+17
| | | | * Added wsrep specific filesSeppo Jaakola2012-04-261-0/+419
* | | | Merge branch '10.2' into 10.3Sergei Golubchik2018-05-111-22/+22
|\ \ \ \ | |/ / /
| * | | Merge branch '10.1' into 10.2Sergei Golubchik2018-05-101-22/+22
| |\ \ \ | | |/ /
| | * | MDEV-16005 sporadic failures with galera tests MW-328B and MW-328Csjaakola2018-04-241-22/+22
| | * | MDEV-14875: galera_new_cluster crashes mysqld when existing server contains d...Jan Lindström2018-03-191-4/+4
* | | | Changed database, tablename and alias to be LEX_CSTRINGMonty2018-01-301-5/+17
* | | | Merge bb-10.2-ext into 10.3Marko Mäkelä2018-01-301-4/+4
|\ \ \ \
| * \ \ \ Merge 10.2 into bb-10.2-extMarko Mäkelä2018-01-301-4/+4
| |\ \ \ \ | | |/ / /
| | * | | MDEV-14875: galera_new_cluster crashes mysqld when existing server contains d...Jan Lindström2018-01-301-4/+4
* | | | | Merge bb-10.2-ext into 10.3Marko Mäkelä2017-11-301-0/+3
|\ \ \ \ \ | |/ / / /
| * | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2017-11-291-0/+3
| |\ \ \ \ | | |/ / /
| | * | | Merge branch '10.1' into 10.2Sergei Golubchik2017-11-211-0/+3
| | |\ \ \ | | | |/ /
| | | * | Merge branch 'github/10.0-galera' into 10.1Sergei Golubchik2017-11-101-0/+3
| | | |\ \ | | | | |/
| | | | * MW-402 cascading FK issuessjaakola2017-11-081-0/+3
* | | | | Merge bb-10.2-ext into 10.3Marko Mäkelä2017-11-101-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Add more execution stages (commit, rollback, etc)Monty2017-11-051-1/+1