summaryrefslogtreecommitdiff
path: root/sql/wsrep_hton.cc
Commit message (Expand)AuthorAgeFilesLines
* 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.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
* | 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
* | Merge branch 'github/10.0-galera' into 10.1Sergei Golubchik2017-11-101-0/+3
|\ \ | |/
| * MW-402 cascading FK issuessjaakola2017-11-081-0/+3
* | Silence a -Wimplicit-fallthrough warningMarko Mäkelä2017-09-171-0/+1
* | Merge remote-tracking branch 'origin/10.0-galera' into 10.1Jan Lindström2017-08-211-0/+1
|\ \ | |/
| * Refs: MW-360 * splitting DROP TABLE query in separate DROP commands for tempo...sjaakola2017-08-111-0/+1
| * refs: MW-319sjaakola2017-03-141-1/+1
* | refs: MW-319sjaakola2017-04-061-1/+1
* | Correct FSF addressiangilfillan2017-03-101-1/+1
* | Merge branch '10.0-galera' into bb-10.1-sergNirbhay Choubey2016-08-251-7/+4
|\ \ | |/
| * Refs: MW-279sjaakola2016-08-211-7/+3
| * MW-269 Fix outstanding issues with wsrep_max_ws_rowsDaniele Sciascia2016-07-251-0/+1
* | Merge branch '10.0-galera' into bb-10.1-sergNirbhay Choubey2016-02-241-0/+14
|\ \ | |/
| * refs codership/mysql-wsrep#237: Add sync point for mtr test.Nirbhay Choubey2016-02-231-0/+3
| * PXC-391: Avoid Total Order Isolation (TOI) for LOCAL sql admin commands.Raghavendra D Prabhu2016-02-221-0/+11
* | Merge branch 'github/10.0-galera' into 10.1Sergei Golubchik2015-11-191-7/+11
|\ \ | |/
| * refs codership/mysql-wsrep#202 Added schema info into wsrep messagesPhilip Stoev2015-10-191-7/+11
| * Refs codership/mysql-wsrep#113 - Extended the protection of local FLUSHsjaakola2015-09-091-1/+1
| * Refs codership/mysql-wsrep#113sjaakola2015-09-091-1/+1
| * Post-merge fixNirbhay Choubey2015-05-081-0/+8
| * Refs codership/mysql-wsrep#33Alexey Yurchenko2015-05-081-2/+3
| * refs #2 - added binlog stmt cache reset after commit. This is needed for non-...sjaakola2015-05-081-4/+19
| * MDEV-7129 : Galera duplicate error on autoincrement field primary keyNirbhay Choubey2015-01-071-1/+2