summaryrefslogtreecommitdiff
path: root/sql/sql_binlog.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge 10.2 into 10.3Marko Mäkelä2020-05-191-1/+2
|\
| * Merge 10.1 into 10.2Marko Mäkelä2020-05-191-1/+2
| |\
| | * MDEV-22520 Assertion `gathered_length == thd->lex->comment.length` failed in ...Andrei Elkin2020-05-181-1/+2
* | | Merge 10.2 into 10.3Marko Mäkelä2019-05-141-1/+1
|\ \ \ | |/ /
| * | Merge 10.1 into 10.2Marko Mäkelä2019-05-131-1/+1
| |\ \ | | |/
| | * Merge branch '5.5' into 10.1Vicențiu Ciorbaru2019-05-111-1/+1
| | |\
| | | * Update FSF AddressVicențiu Ciorbaru2019-05-111-1/+1
* | | | fix of windows compiler warningsOleksandr Byelkin2019-02-181-1/+1
* | | | merge fixes: sql_binlog.cc is doneAndrei Elkin2019-02-071-3/+3
* | | | dirty mergeOleksandr Byelkin2019-02-071-10/+81
|\ \ \ \ | |/ / /
| * | | Merge 10.1 into 10.2Marko Mäkelä2019-02-021-10/+81
| |\ \ \ | | |/ /
| | * | MDEV-10963 Fragmented BINLOG queryAndrei Elkin2019-01-241-12/+82
* | | | MDEV-15091 : Windows, 64bit: reenable and fix warning C4267 (conversion from ...Vladislav Vaintroub2018-02-061-1/+1
* | | | Merge bb-10.2-ext into 10.3Marko Mäkelä2017-10-041-2/+2
|\ \ \ \ | |/ / /
| * | | MDEV-13844 : Fix Windows warnings. Fix DBUG_PRINT.Vladislav Vaintroub2017-09-281-2/+2
* | | | Enusure that my_global.h is included firstMichael Widenius2017-08-241-1/+1
|/ / /
* | | Merge branch '10.1' into 10.2Sergei Golubchik2017-03-301-1/+0
|\ \ \ | |/ /
| * | base64 serviceSergei Golubchik2017-03-101-1/+0
* | | MDEV-7145: Delayed replicationKristian Nielsen2016-10-161-53/+98
|\ \ \
| * | | MDEV-7145: Delayed replication, cleanup some codeKristian Nielsen2016-10-141-1/+1
| * | | MDEV-7145: Delayed replication, fixing test failures.Kristian Nielsen2016-10-141-0/+3
| * | | MDEV-7145: Delayed replication, intermediate commit.Kristian Nielsen2016-10-141-53/+95
| |/ /
* | | name clash with gnutls on on base64_encodeSergei Golubchik2016-09-121-2/+2
|/ /
* | MDEV-5120 Test suite test maria-no-logging failsMichael Widenius2014-09-301-0/+1
* | 10.0-base mergeSergei Golubchik2014-02-261-1/+1
|\ \
| * \ 5.5 mergeSergei Golubchik2014-02-251-1/+1
| |\ \ | | |/
| | * MySQL-5.5.36 mergeSergei Golubchik2014-02-171-1/+1
| | |\
| | | * Updated/added copyright headersMurthy Narkedimilli2014-01-061-1/+1
* | | | Merge from 10.0-base to 10.0 the feature MDEV-4506: Parallel replication.unknown2013-11-011-3/+8
|\ \ \ \ | |/ / /
| * | | Fixes for parallel slave:Michael Widenius2013-10-141-3/+2
| * | | MDEV-4506: parallel replication.unknown2013-09-161-1/+1
| * | | MDEV-4506, parallel replication.unknown2013-09-131-1/+1
| * | | MDEV-4506: Parallel replication: Intermediate commitunknown2013-07-121-4/+7
| * | | MDEV-4506: Parallel replication: Intermediate commit.unknown2013-07-091-13/+4
| * | | MDEV-4506: Parallel replication: Intermediate commit.unknown2013-06-281-1/+13
| |/ /
* | | Merging TO_BASE64() and FROM_BASE64() from MySQL-5.6Alexander Barkov2013-09-231-1/+2
|/ /
* | mysql-5.5.31 mergeSergei Golubchik2013-05-071-1/+1
|\ \ | |/
| * Bug#11757464:SERVER CRASH IN RECURSIVE CALL WHEN OOMNisha Gopalakrishnan2013-01-151-1/+1
* | compilation warning: unused variableSergei Golubchik2012-03-051-2/+2
* | Merge MWL#234: @@skip_replication feature to MariaDB 5.5.unknown2012-03-011-0/+11
|\ \
| * | MWL#234: After-review fixes, including better names for the new system variab...unknown2011-08-121-7/+7
| * | MWL#234: Support for marking binlog events to not be replicated, and for tell...unknown2011-08-111-0/+9
* | | 5.3 mergeSergei Golubchik2012-01-131-1/+1
|\ \ \
| * \ \ Merge with 5.2.Michael Widenius2011-12-111-3/+5
| |\ \ \
| | * \ \ Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-211-3/+5
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Updated/added copyright headersKent Boortz2011-07-031-2/+2
| | | |\ \
| | | * | | Updated/added copyright headersKent Boortz2011-06-301-2/+4
* | | | | | mysql-5.5.18 mergeSergei Golubchik2011-11-031-1/+2
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Updated/added copyright headersKent Boortz2011-07-041-1/+2
* | | | | | merge with 5.3Sergei Golubchik2011-10-191-2/+3
|\ \ \ \ \ \ | | |/ / / / | |/| | | |