summaryrefslogtreecommitdiff
path: root/sql/log_event.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '10.0' into 10.1Sergei Golubchik2016-06-281-9/+54
|\
| * MDEV-8638: REVOKE ALL PRIVILEGES, GRANT OPTION FROM CURRENT_ROLE breaks repli...Vicențiu Ciorbaru2016-06-221-2/+17
| * Merge branch '5.5' into bb-10.0Sergei Golubchik2016-06-211-7/+37
| |\
| | * Merge branch 'mysql/5.5' into 5.5Sergei Golubchik2016-06-141-7/+39
| | |\
| | | * BUG#17018343 SLAVE CRASHES WHEN APPLYING ROW-BASED BINLOG ENTRIES IN CASCADINGVenkatesh Duggirala2016-03-011-7/+39
* | | | MDEV-6058 MySQL Bug #11766693: LOG-SLOW-ADMIN-STATEMENTS ANDAlexey Botchkov2016-03-221-0/+9
* | | | MDEV-9737 Duplicate error in replication with slave triggers and auto incrementSergei Golubchik2016-03-221-0/+1
* | | | Merge branch '10.0' into 10.1Sergei Golubchik2016-03-211-4/+7
|\ \ \ \ | |/ / /
| * | | MDEV-9560 Mariadb 10.1 Crashes when replicating from 10.0Sergei Golubchik2016-03-211-2/+5
| * | | Fix spelling: occurred, execute, which etcOtto Kekäläinen2016-03-041-2/+2
* | | | Merge branch 'bb-10.1-serg' into 10.1Sergei Golubchik2016-02-241-5/+24
|\ \ \ \
| * \ \ \ Merge branch '10.0-galera' into bb-10.1-sergNirbhay Choubey2016-02-241-0/+19
| |\ \ \ \
| | * \ \ \ Merge tag 'mariadb-10.0.24' into 10.0-galeraNirbhay Choubey2016-02-231-5/+5
| | |\ \ \ \ | | | |/ / /
| | * | | | refs codership/mysql-wsrep#201Daniele Sciascia2016-02-221-0/+19
| | * | | | Merge tag 'mariadb-10.0.23' into 10.0-galeraNirbhay Choubey2015-12-191-10/+12
| | |\ \ \ \
| | * \ \ \ \ Merge tag 'mariadb-10.0.22' into 10.0-galeraNirbhay Choubey2015-10-311-22/+120
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge tag 'mariadb-10.0.21' into 10.0-galeraNirbhay Choubey2015-08-081-21/+35
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge tag 'mariadb-10.0.20' into 10.0-galeraNirbhay Choubey2015-06-211-0/+6
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge tag 'mariadb-10.0.19' into 10.0-galeraNirbhay Choubey2015-05-091-29/+14
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch '5.5-galera' into 10.0-galeraNirbhay Choubey2015-03-281-1/+0
| | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge revisions from maria/5.5 (5.5.41)Nirbhay Choubey2014-12-221-4/+13
| | | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ bzr merge -rtag:mariadb-5.5.40 maria/5.5Nirbhay Choubey2014-10-091-1/+1
| | | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ Local merge of mariadb-5.5.39Nirbhay Choubey2014-08-061-3/+3
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ Merge from lp:maria/5.5 to maria-5.5.37 release revision 4154.Jan Lindström2014-04-161-9/+74
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | * Merged revisions 3945, 3946..3950, 3951..3961Nirbhay Choubey2014-02-281-1/+6
| | | * | | | | | | | | | | | | Merge from maria/5.5 (-rtag:mariadb-5.5.36).Nirbhay Choubey2014-02-251-0/+20
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge of maria/5.5 into maria-5.5-galera.Nirbhay Choubey2014-01-291-3/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | Merging revision 3839..3932 from codership-mysql/5.5.Nirbhay Choubey2014-01-091-49/+8
| | | * | | | | | | | | | | | | | | Merge with MariaDB 5.5.34.Jan Lindström2013-11-251-4/+14
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ mariadb-5.5.33 mergeSergei Golubchik2013-09-181-3/+9
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge with mariadb 5.5: bzr merge lp:maria/5.5 --rtag:mariadb-5.5.32Seppo Jaakola2013-08-211-3/+13
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | References lp:1169326 - merged fix from LP wsrep-5.5-23Seppo Jaakola2013-06-131-0/+29
| | | * | | | | | | | | | | | | | | | | | References: MDEV-4572 - merge with mariaDB 5.5.31Seppo Jaakola2013-05-261-12/+26
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ References: MDEV-4572 - merge with mariaDB 5.5.30Seppo Jaakola2013-05-241-4/+14
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ References lp:1115708 - merged with lp:mariadb/5.5 revision 3657Seppo Jaakola2013-02-051-21/+67
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ References lp:1066784 - bzr merge lp:maria/5.5 (rev: 3562)Seppo Jaakola2012-10-241-2/+34
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ References lp:1051808 - merged with lp:maria/5.5Seppo Jaakola2012-09-171-218/+290
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ References lp:1034621 - Merge up to mysql-5.5.25 levelSeppo Jaakola2012-08-091-2/+37
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ references lp:1011983Seppo Jaakola2012-06-121-7/+46
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | | | | | References lp:1011983Seppo Jaakola2012-06-121-1/+5
| | | * | | | | | | | | | | | | | | | | | | | | | | | | Merged changes from lp:codership-mysql up to rev 3743Seppo Jaakola2012-04-261-13/+12
| | | * | | | | | | | | | | | | | | | | | | | | | | | | Merge with mariaDB 5.5.23: bzr merge lp:maria/5.5Seppo Jaakola2012-04-261-4/+21
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | Initial push of codership-wsrep API implementation for MariaDB. Seppo Jaakola2012-04-131-1/+150
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | Merge tag 'mariadb-10.0.17' into 10.0-galeraNirbhay Choubey2015-02-271-5/+9
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ maria-10.0.16 mergeNirbhay Choubey2015-01-261-4/+12
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ bzr merge -rtag:mariadb-10.0.15 maria/10.0Nirbhay Choubey2014-12-051-31/+14
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ bzr merge -rtag:mariadb-10.0.14 maria/10.0/Nirbhay Choubey2014-09-281-21/+25
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ bzr merge -r4346 maria/10.0 (maria-10.0.13)Nirbhay Choubey2014-08-111-64/+134
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ bzr merge -rtag:mariadb-10.0.12 maria/10.0Nirbhay Choubey2014-06-191-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ bzr merge -r4209 maria/10.0.Nirbhay Choubey2014-05-211-24/+92
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \