summaryrefslogtreecommitdiff
path: root/sql/sql_class.h
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '10.0' into 10.1Sergei Golubchik2016-01-251-0/+1
|\
| * Cleanup of slave code:Monty2016-01-031-0/+1
* | Merge branch 'github/10.0-galera' into 10.1Sergei Golubchik2015-12-221-0/+1
|\ \
| * \ Merge tag 'mariadb-10.0.23' into 10.0-galeraNirbhay Choubey2015-12-191-0/+1
| |\ \ | | |/
| * | MDEV-9162 : MariaDB Galera Cluster memory leak on async slave nodeNirbhay Choubey2015-12-141-0/+1
| * | Merge tag 'mariadb-10.0.22' into 10.0-galeraNirbhay Choubey2015-10-311-3/+0
| |\ \
| * \ \ Merge tag 'mariadb-10.0.21' into 10.0-galeraNirbhay Choubey2015-08-081-4/+12
| |\ \ \
| * | | | MDEV-8240 : Unknown option 'table_type' when using Connect Engine on MGCNirbhay Choubey2015-07-291-40/+42
| * | | | Merge branch '5.5-galera' into 10.0-galeraNirbhay Choubey2015-06-231-0/+2
| |\ \ \ \
| | * | | | MDEV-8260 : Issues related to concurrent CTASNirbhay Choubey2015-06-191-0/+2
| | * | | | Merge tag 'mariadb-5.5.43' into 5.5-galeraNirbhay Choubey2015-05-041-6/+5
| | |\ \ \ \
| * | \ \ \ \ Merge tag 'mariadb-10.0.19' into 10.0-galeraNirbhay Choubey2015-05-091-8/+36
| |\ \ \ \ \ \
| * | | | | | | refs codership/mysql-wsrep#90 made wsrep_OSU_method session variableTeemu Ollakka2015-05-081-1/+1
| * | | | | | | refs codership/mysql-wsrep#90 - fixed race in OSUTeemu Ollakka2015-05-081-0/+1
| * | | | | | | Merge branch '5.5-galera' into 10.0-galeraNirbhay Choubey2015-03-281-1/+0
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | MDEV-7194: galera fails to replicate DDL queries when using binlog_checksumNirbhay Choubey2015-03-271-0/+1
| | * | | | | | cleanup: remove unused THD::COND_wsrep_thdNirbhay Choubey2015-02-191-1/+0
| | * | | | | | MDEV-7476: Allow SELECT to succeed even when node is not readyNirbhay Choubey2015-01-271-0/+1
| | * | | | | | Merged r4014 from codership/5.5Nirbhay Choubey2014-08-121-0/+1
| | * | | | | | Merge from lp:maria/5.5 to maria-5.5.37 release revision 4154.Jan Lindström2014-04-161-5/+17
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge of maria/5.5 into maria-5.5-galera.Nirbhay Choubey2014-01-291-0/+5
| | |\ \ \ \ \ \ \
| | * | | | | | | | Merging revision 3839..3932 from codership-mysql/5.5.Nirbhay Choubey2014-01-091-5/+10
| | * | | | | | | | Merge with MariaDB 5.5.34.Jan Lindström2013-11-251-3/+9
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Merged revisions 3931--3942 from from lp:~codership/codership-mysql/5.5-23.Jan Lindström2013-11-251-0/+2
| | * | | | | | | | | Merged revisions 2925--3929 from from lp:~codership/codership-mysql/5.5-23Jan Lindström2013-11-251-13/+0
| | * | | | | | | | | mariadb-5.5.33 mergeSergei Golubchik2013-09-181-2/+4
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Merged with lp:~codership/codership-mysql/5.5-23, up to revision 3903Seppo Jaakola2013-08-211-0/+3
| | * | | | | | | | | | Merge with mariadb 5.5: bzr merge lp:maria/5.5 --rtag:mariadb-5.5.32Seppo Jaakola2013-08-211-3/+16
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ References: MDEV-4572 - merge with mariaDB 5.5.30Seppo Jaakola2013-05-241-1/+5
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | References https://mariadb.atlassian.net/browse/MDEV-4176Seppo Jaakola2013-02-171-0/+1
| | * | | | | | | | | | | | References lp:1115708 - merged with lp:mariadb/5.5 revision 3657Seppo Jaakola2013-02-051-2/+18
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ References lp:1066784 - bzr merge lp:maria/5.5 (rev: 3562)Seppo Jaakola2012-10-241-3/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | References lp:1066784Seppo Jaakola2012-10-231-31/+1
| | * | | | | | | | | | | | | | References lp:1051808 - merged with lp:maria/5.5Seppo Jaakola2012-09-171-11/+15
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Merged in change sets 3772-3779 from lp:codership-mysql/5.5mariadb-galera-5.5.25Seppo Jaakola2012-08-301-0/+1
| | * | | | | | | | | | | | | | | References lp:1034621 - Merge up to mysql-5.5.25 levelSeppo Jaakola2012-08-091-5/+16
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ references lp:1011983Seppo Jaakola2012-06-121-0/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | Initial push of codership-wsrep API implementation for MariaDB. Seppo Jaakola2012-04-131-3/+84
| * | | | | | | | | | | | | | | | | | cleanup: remove unused THD::COND_wsrep_thdNirbhay Choubey2015-02-191-1/+0
| * | | | | | | | | | | | | | | | | | MDEV-7476: Allow SELECT to succeed even when node is not readyNirbhay Choubey2015-01-271-0/+1
| * | | | | | | | | | | | | | | | | | maria-10.0.16 mergeNirbhay Choubey2015-01-261-0/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ bzr merge -rtag:mariadb-10.0.15 maria/10.0Nirbhay Choubey2014-12-051-0/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ bzr merge -rtag:mariadb-10.0.14 maria/10.0/Nirbhay Choubey2014-09-281-6/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | bzr merge -c4123 codership/5.6/Nirbhay Choubey2014-08-121-0/+1
| * | | | | | | | | | | | | | | | | | | | | bzr merge -r4346 maria/10.0 (maria-10.0.13)Nirbhay Choubey2014-08-111-3/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ bzr merge -r4209 maria/10.0.Nirbhay Choubey2014-05-211-4/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merging mariadb-10.0.10.Nirbhay Choubey2014-04-081-12/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ * bzr merge -rtag:mariadb-10.0.9 maria/10.0Nirbhay Choubey2014-03-261-38/+86
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge MariaDB-10.0.7 revision 3961.Jan Lindström2014-01-251-4/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ merge with MariaDB 5.6 bzr merge lp:maria --rtag:mariadb-10.0.6Seppo Jaakola2013-12-041-15/+243
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \