summaryrefslogtreecommitdiff
path: root/sql/sql_class.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '10.0' into 10.1Sergei Golubchik2016-02-231-1/+114
|\
| * Merge branch '5.5' into 10.0Sergei Golubchik2016-02-151-1/+114
| |\
| | * Merge branch 'mysql/5.5' into 5.5Sergei Golubchik2016-02-091-1/+134
| | |\
| | | * Bug #17047208 REPLICATION DIFFERENCE FOR MULTIPLE TRIGGERSVenkatesh Duggirala2015-11-211-1/+3
| | | * Bug#19941403: FATAL_SIGNAL(SIG 6) IN BUILD_EQUAL_ITEMS_FOR_COND | IN SQL/SQL_...Chaithra Gopalareddy2015-11-201-0/+15
| | | * Bug#17047208 REPLICATION DIFFERENCE FOR MULTIPLE TRIGGERSVenkatesh Duggirala2015-11-191-0/+131
| | | * Merge branch 'mysql-5.1' into mysql-5.5Sreeharsha Ramanavarapu2015-07-101-15/+22
| | | |\
| | | | * Bug #20238729: ILLEGALLY CRAFTED UTF8 SELECT PROVIDES NOSreeharsha Ramanavarapu2015-07-101-16/+22
| | | * | Bug#20788853 MUTEX ISSUE IN SQL/SQL_SHOW.CC RESULTING IN SIG6. SOURCE LIKELYMarc Alff2015-04-081-0/+1
* | | | | Merge branch '10.0' into 10.1Sergei Golubchik2016-01-251-1/+8
|\ \ \ \ \ | |/ / / /
| * | | | Cleanup of slave code:Monty2016-01-031-1/+8
| * | | | MDEV-9088 Server crashes on shutdown after the second post of feedback reportSergei Golubchik2015-12-191-1/+1
* | | | | cleanup: create LEX_USER::reset_auth()Sergei Golubchik2016-01-251-3/+1
* | | | | Merge branch 'github/10.0-galera' into 10.1Sergei Golubchik2015-12-221-1/+2
|\ \ \ \ \
| * | | | | MDEV-9162 : MariaDB Galera Cluster memory leak on async slave nodeNirbhay Choubey2015-12-141-1/+6
| * | | | | Merge tag 'mariadb-10.0.22' into 10.0-galeraNirbhay Choubey2015-10-311-10/+6
| |\ \ \ \ \ | | |/ / / /
| * | | | | Refs codership/mysql-wsrep#113 - Extended the protection of local FLUSHsjaakola2015-09-091-1/+0
| * | | | | Refs codership/mysql-wsrep#113sjaakola2015-09-091-0/+1
| * | | | | Merge tag 'mariadb-10.0.21' into 10.0-galeraNirbhay Choubey2015-08-081-1/+6
| |\ \ \ \ \
| * | | | | | MDEV-8240 : Unknown option 'table_type' when using Connect Engine on MGCNirbhay Choubey2015-07-311-8/+9
| * | | | | | Merge tag 'mariadb-10.0.20' into 10.0-galeraNirbhay Choubey2015-06-211-0/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch '5.5-galera' into 10.0-galeraNirbhay Choubey2015-05-121-10/+0
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge tag 'mariadb-5.5.43' into 5.5-galeraNirbhay Choubey2015-05-041-13/+18
| | |\ \ \ \ \ \ \
| | * | | | | | | | MDEV-7995 : DMLs not getting replicated with log-bin=OFF & binlog-format != ROWNirbhay Choubey2015-04-221-10/+0
| * | | | | | | | | Merge tag 'mariadb-10.0.19' into 10.0-galeraNirbhay Choubey2015-05-091-14/+32
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | refs codership/mysql-wsrep#90 made wsrep_OSU_method session variableTeemu Ollakka2015-05-081-2/+0
| * | | | | | | | | | refs codership/mysql-wsrep#90 - fixed race in OSUTeemu Ollakka2015-05-081-1/+2
| * | | | | | | | | | Merge branch '5.5-galera' into 10.0-galeraNirbhay Choubey2015-03-281-2/+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-6924 : Server crashed on CREATE TABLE ... SELECTNirbhay Choubey2014-11-171-0/+10
| | * | | | | | | | | MDEV-6646 : global.wsrep_causal_reads no longer honoredNirbhay Choubey2014-08-261-0/+8
| | * | | | | | | | | Local merge of mariadb-5.5.39Nirbhay Choubey2014-08-061-1/+1
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge from lp:maria/5.5 to maria-5.5.37 release revision 4154.Jan Lindström2014-04-161-6/+4
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge of maria/5.5 into maria-5.5-galera.Nirbhay Choubey2014-01-291-1/+3
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Merging revision 3839..3932 from codership-mysql/5.5.Nirbhay Choubey2014-01-091-22/+25
| | * | | | | | | | | | | | Merge with MariaDB 5.5.34.Jan Lindström2013-11-251-0/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Merged revisions 2925--3929 from from lp:~codership/codership-mysql/5.5-23Jan Lindström2013-11-251-12/+3
| | * | | | | | | | | | | | | 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/+4
| | * | | | | | | | | | | | | | Merge with mariadb 5.5: bzr merge lp:maria/5.5 --rtag:mariadb-5.5.32Seppo Jaakola2013-08-211-6/+46
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ References: MDEV-4572 - merge with mariaDB 5.5.31Seppo Jaakola2013-05-261-7/+13
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ References: MDEV-4572 - merge with mariaDB 5.5.30Seppo Jaakola2013-05-241-45/+34
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | References https://mariadb.atlassian.net/browse/MDEV-4185 - thread terminate ...Seppo Jaakola2013-02-211-2/+2
| | * | | | | | | | | | | | | | | | | References https://mariadb.atlassian.net/browse/MDEV-4176Seppo Jaakola2013-02-171-3/+8
| | * | | | | | | | | | | | | | | | | References lp:1115708 - merged with lp:mariadb/5.5 revision 3657Seppo Jaakola2013-02-051-24/+43
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | merged with codership-mysql up to revision 3839Seppo Jaakola2013-02-051-1/+1
| | * | | | | | | | | | | | | | | | | | References lp:1066784 - bzr merge lp:maria/5.5 (rev: 3562)Seppo Jaakola2012-10-241-0/+70
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | References lp:1066784Seppo Jaakola2012-10-231-11/+49
| | * | | | | | | | | | | | | | | | | | | References lp:1051808 - merged with lp:maria/5.5Seppo Jaakola2012-09-171-5/+134
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \