summaryrefslogtreecommitdiff
path: root/sql/wsrep_hton.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '10.1' into 10.2Sergei Golubchik2016-09-091-7/+4
|\
| * 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.1' into 10.2Sergei Golubchik2016-02-251-0/+14
|\ \ \ | |/ /
| * | 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
* | | Changed my_thread_id to int64 to fix compilation problem withMonty2016-02-081-13/+15
|/ /
* | 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
| * MDEV-6481: Yum Upgrade on CentOS 6.5 causes instantmariadb-galera-10.0.14Nirbhay Choubey2014-10-081-9/+7
| * bzr merge -r4065..4088 codership/5.6Nirbhay Choubey2014-05-211-5/+5
| * bzr merge -r3968..3984 codership/5.5 (non-Innodb changes only).Nirbhay Choubey2014-05-211-0/+6
| * Local merge (mariadb-galera-10.0.10).Nirbhay Choubey2014-04-091-13/+6
| |\
| | * bzr merge -r3946..3968 codership/5.5Nirbhay Choubey2014-03-251-13/+6
| * | References: lp:1299430 - initial support for tokudb replication in master-sla...Seppo Jaakola2014-03-291-1/+2
| |/
| * * Merged revisions: 3431, 3435..3457, 3459, 3460 from maria-5.5-galera.Nirbhay Choubey2014-01-301-5/+7
| * merge with MariaDB 5.6 bzr merge lp:maria --rtag:mariadb-10.0.6Seppo Jaakola2013-12-041-21/+34
| * bzr merge -r3904..3928 lp:codership-mysql/5.5Seppo Jaakola2013-11-271-1/+1
| * bzr merge -r3895..3903 lp:codership-mysql/5.5 Seppo Jaakola2013-11-261-57/+142
| * merge from lp:codership-mysql/5.5 rev #3895Seppo Jaakola2013-11-261-9/+12
| * Merges from lp:codership-mysql/5.5 up to rev #3893, this changes to wsrep API...Seppo Jaakola2013-11-261-69/+65
| * Merge fixes, now at level 3430 in mariadb-galera-5.5Seppo Jaakola2013-10-071-6/+6
| * Merged revisions 3418..3424 from mariadb-galera-5.5Seppo Jaakola2013-10-071-7/+19
| * Merged revisions 3411..3417 from mariadb-galera-5.5Seppo Jaakola2013-10-071-12/+12
| * Merge 10.0 to galera-10.0Jan Lindström2013-09-031-0/+466
* Merge branch '10.0-galera' into 10.1Nirbhay Choubey2015-07-141-6/+30
* MDEV-7604: wsrep plugin lists its plugin_maturity as UnknownJan Lindström2015-02-181-4/+4
* remove wsrep_hton dependency from innodb/xtradbSergei Golubchik2015-01-081-7/+3
* MDEV-7374 : Losing connection to MySQL while running ALTER TABLENirbhay Choubey2014-12-311-6/+8
* cleanup: galera misc cleanupsSergei Golubchik2014-10-101-0/+5
* cleanup: remove OPT_WSREP_START_POSITION and OPT_WSREP_SST_AUTHSergei Golubchik2014-10-011-2/+3
* MDEV-6247: Merge 10.0-galera to 10.1.Jan Lindström2014-08-261-0/+577