summaryrefslogtreecommitdiff
path: root/sql/sql_base.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '10.0' into 10.0-galeraNirbhay Choubey2016-04-291-5/+5
|\
| * Fix spelling: occurred, execute, which etcOtto Kekäläinen2016-03-041-5/+5
* | Merge tag 'mariadb-10.0.24' into 10.0-galeraNirbhay Choubey2016-02-231-158/+11
|\ \ | |/
| * Merge branch '5.5' into 10.0Sergei Golubchik2016-02-151-157/+11
| |\
| | * Merge branch 'mysql/5.5' into 5.5Sergei Golubchik2016-02-091-155/+11
| | |\
| | | * Bug#17047208 REPLICATION DIFFERENCE FOR MULTIPLE TRIGGERSVenkatesh Duggirala2015-11-191-154/+0
| | | * Bug#20691429 ASSERTION `CHILD_L' FAILED IN STORAGE/MYISAMMRG/Ajo Robert2015-11-131-0/+10
| * | | MDEV-9088 Server crashes on shutdown after the second post of feedback reportSergei Golubchik2015-12-191-1/+0
* | | | Merge tag 'mariadb-10.0.23' into 10.0-galeraNirbhay Choubey2015-12-191-30/+5
|\ \ \ \ | |/ / /
| * | | MDEV-8913 Derived queries with same column names as final projection causes i...Oleksandr Byelkin2015-10-301-30/+5
* | | | Merge tag 'mariadb-10.0.22' into 10.0-galeraNirbhay Choubey2015-10-311-16/+11
|\ \ \ \ | |/ / /
| * | | Merge branch '5.5' into 10.0Sergei Golubchik2015-10-091-3/+11
| |\ \ \ | | |/ /
| | * | Merge remote-tracking branch 'mysql/5.5' into 5.5Sergei Golubchik2015-10-081-3/+11
| | |\ \ | | | |/
| | | * BUG#20449914: HANDLE_FATAL_SIGNAL (SIG=11) INNisha Gopalakrishnan2015-08-251-3/+11
| * | | MDEV-6219: Server crashes in Bitmap<64u>::merge (this=0x180, map2=...) on 2nd...Oleksandr Byelkin2015-08-311-13/+0
* | | | Merge branch '5.5-galera' into 10.0-galeraNirbhay Choubey2015-08-141-14/+16
|\ \ \ \
| * | | | MDEV-8617: Multiple galera tests failures with --ps-protocolNirbhay Choubey2015-08-141-14/+16
| * | | | Merge tag 'mariadb-5.5.45' into 5.5-galeraNirbhay Choubey2015-08-071-7/+52
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Merge tag 'mariadb-5.5.44' into 5.5-galeraNirbhay Choubey2015-06-211-1/+2
| |\ \ \ \
| * \ \ \ \ Merge tag 'mariadb-5.5.43' into 5.5-galeraNirbhay Choubey2015-05-041-6/+11
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch '5.5' into 5.5-galeraNirbhay Choubey2015-02-181-0/+3
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge revisions from maria/5.5Nirbhay Choubey2014-12-161-1/+0
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ bzr merge -rtag:mariadb-5.5.38 maria/5.5Nirbhay Choubey2014-06-101-62/+75
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Merge lp:codership-mysql/5.5 -r3961..3980.Jan Lindström2014-04-161-0/+1
| * | | | | | | | | Merge from lp:maria/5.5 to maria-5.5.37 release revision 4154.Jan Lindström2014-04-161-0/+11
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | * Merged the missing revision 3934 fromNirbhay Choubey2014-02-051-1/+1
| * | | | | | | | | | Merge of maria/5.5 into maria-5.5-galera.Nirbhay Choubey2014-01-291-35/+54
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Merging revision 3839..3932 from codership-mysql/5.5.Nirbhay Choubey2014-01-091-4/+5
| * | | | | | | | | | | MDEV#5407, MDEV#5386, MVED#4222Nirbhay Choubey2013-12-101-6/+0
| * | | | | | | | | | | MDEV-5386: Server crashes in thd_get_ha_data on maria-5.5-galera tree while r...Jan Lindström2013-12-051-1/+6
| * | | | | | | | | | | MDEV-4235: Galera: Assertion `0' fails in tdc_remove_table on creating a triggerJan Lindström2013-11-291-4/+16
| * | | | | | | | | | | Merge with MariaDB 5.5.34.Jan Lindström2013-11-251-21/+20
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | References: lp:1233353 - releasing explicit MDL locks for BF aborted transact...Seppo Jaakola2013-09-301-2/+4
| * | | | | | | | | | | | Merge with mariadb 5.5: bzr merge lp:maria/5.5 --rtag:mariadb-5.5.32Seppo Jaakola2013-08-211-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ References: MDEV-4572 - merge with mariaDB 5.5.31Seppo Jaakola2013-05-261-3/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ References: MDEV-4572 - merge with mariaDB 5.5.30Seppo Jaakola2013-05-241-29/+47
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ References lp:1115708 - merged with lp:mariadb/5.5 revision 3657Seppo Jaakola2013-02-051-14/+95
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ References: lp:1066784 - Merged with MariaDB 5.5.28aSeppo Jaakola2012-11-301-4/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ References lp:1066784 - bzr merge lp:maria/5.5 (rev: 3562)Seppo Jaakola2012-10-241-8/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | References lp:1051808 - merged with lp:codership-mysql 5.5.27 based trunkSeppo Jaakola2012-09-181-3/+1
| * | | | | | | | | | | | | | | | | | References lp:1051808 - merged with lp:maria/5.5Seppo Jaakola2012-09-171-32/+25
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ References lp:1034621 - Merge up to mysql-5.5.25 levelSeppo Jaakola2012-08-091-0/+33
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ references lp:1011983Seppo Jaakola2012-06-121-18/+57
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Merged changes from lp:codership-mysql up to rev 3743Seppo Jaakola2012-04-261-0/+19
| * | | | | | | | | | | | | | | | | | | | | Merge with mariaDB 5.5.23: bzr merge lp:maria/5.5Seppo Jaakola2012-04-261-20/+77
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Initial push of codership-wsrep API implementation for MariaDB. Seppo Jaakola2012-04-131-2/+31
* | | | | | | | | | | | | | | | | | | | | | | Merge tag 'mariadb-10.0.21' into 10.0-galeraNirbhay Choubey2015-08-081-7/+52
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge branch '5.5' into 10.0Sergei Golubchik2015-08-051-7/+51
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Merge tag 'mysql-5.5.45' into 5.5Sergei Golubchik2015-08-011-7/+51
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | Bug #18075170 SQL NODE RESTART REQUIRED TOAjo Robert2015-05-111-7/+51
View Lorry Controller Status