Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | mysys: rename ME_xxx flags to match plugin api | Sergei Golubchik | 2018-06-04 | 1 | -1/+1 |
* | MDEV-15091 : Windows, 64bit: reenable and fix warning C4267 (conversion from ... | Vladislav Vaintroub | 2018-02-06 | 1 | -1/+1 |
* | Merge bb-10.2-ext into 10.3 | Marko Mäkelä | 2017-10-04 | 1 | -2/+2 |
|\ | |||||
| * | MDEV-13844 : Fix Windows warnings. Fix DBUG_PRINT. | Vladislav Vaintroub | 2017-09-28 | 1 | -2/+2 |
* | | Enusure that my_global.h is included first | Michael Widenius | 2017-08-24 | 1 | -1/+1 |
|/ | |||||
* | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-03-30 | 1 | -1/+0 |
|\ | |||||
| * | base64 service | Sergei Golubchik | 2017-03-10 | 1 | -1/+0 |
* | | MDEV-7145: Delayed replication | Kristian Nielsen | 2016-10-16 | 1 | -53/+98 |
|\ \ | |||||
| * | | MDEV-7145: Delayed replication, cleanup some code | Kristian Nielsen | 2016-10-14 | 1 | -1/+1 |
| * | | MDEV-7145: Delayed replication, fixing test failures. | Kristian Nielsen | 2016-10-14 | 1 | -0/+3 |
| * | | MDEV-7145: Delayed replication, intermediate commit. | Kristian Nielsen | 2016-10-14 | 1 | -53/+95 |
| |/ | |||||
* | | name clash with gnutls on on base64_encode | Sergei Golubchik | 2016-09-12 | 1 | -2/+2 |
|/ | |||||
* | MDEV-5120 Test suite test maria-no-logging fails | Michael Widenius | 2014-09-30 | 1 | -0/+1 |
* | 10.0-base merge | Sergei Golubchik | 2014-02-26 | 1 | -1/+1 |
|\ | |||||
| * | 5.5 merge | Sergei Golubchik | 2014-02-25 | 1 | -1/+1 |
| |\ | |||||
| | * | MySQL-5.5.36 merge | Sergei Golubchik | 2014-02-17 | 1 | -1/+1 |
| | |\ | |||||
| | | * | Updated/added copyright headers | Murthy Narkedimilli | 2014-01-06 | 1 | -1/+1 |
* | | | | Merge from 10.0-base to 10.0 the feature MDEV-4506: Parallel replication. | unknown | 2013-11-01 | 1 | -3/+8 |
|\ \ \ \ | |/ / / | |||||
| * | | | Fixes for parallel slave: | Michael Widenius | 2013-10-14 | 1 | -3/+2 |
| * | | | MDEV-4506: parallel replication. | unknown | 2013-09-16 | 1 | -1/+1 |
| * | | | MDEV-4506, parallel replication. | unknown | 2013-09-13 | 1 | -1/+1 |
| * | | | MDEV-4506: Parallel replication: Intermediate commit | unknown | 2013-07-12 | 1 | -4/+7 |
| * | | | MDEV-4506: Parallel replication: Intermediate commit. | unknown | 2013-07-09 | 1 | -13/+4 |
| * | | | MDEV-4506: Parallel replication: Intermediate commit. | unknown | 2013-06-28 | 1 | -1/+13 |
| |/ / | |||||
* | | | Merging TO_BASE64() and FROM_BASE64() from MySQL-5.6 | Alexander Barkov | 2013-09-23 | 1 | -1/+2 |
|/ / | |||||
* | | mysql-5.5.31 merge | Sergei Golubchik | 2013-05-07 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Bug#11757464:SERVER CRASH IN RECURSIVE CALL WHEN OOM | Nisha Gopalakrishnan | 2013-01-15 | 1 | -1/+1 |
* | | compilation warning: unused variable | Sergei Golubchik | 2012-03-05 | 1 | -2/+2 |
* | | Merge MWL#234: @@skip_replication feature to MariaDB 5.5. | unknown | 2012-03-01 | 1 | -0/+11 |
|\ \ | |||||
| * | | MWL#234: After-review fixes, including better names for the new system variab... | unknown | 2011-08-12 | 1 | -7/+7 |
| * | | MWL#234: Support for marking binlog events to not be replicated, and for tell... | unknown | 2011-08-11 | 1 | -0/+9 |
* | | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -1/+1 |
|\ \ \ | |||||
| * \ \ | Merge with 5.2. | Michael Widenius | 2011-12-11 | 1 | -3/+5 |
| |\ \ \ | |||||
| | * \ \ | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -3/+5 |
| | |\ \ \ | | | |/ / | | |/| | | |||||
| | | * | | Updated/added copyright headers | Kent Boortz | 2011-07-03 | 1 | -2/+2 |
| | | |\ \ | |||||
| | | * | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+4 |
* | | | | | | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 1 | -1/+2 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | Updated/added copyright headers | Kent Boortz | 2011-07-04 | 1 | -1/+2 |
* | | | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -2/+3 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | Backport MySQL WL#2540 into MariaDB. | unknown | 2011-05-03 | 1 | -1/+2 |
| * | | | | | Merge MariaDB 5.2.5 release into MariaDB-5.2-rpl. | unknown | 2011-04-01 | 1 | -0/+8 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| | * | | | | Merge with MySQL 5.1.55 | Michael Widenius | 2011-02-20 | 1 | -0/+8 |
| | |\ \ \ \ | | | | |/ / | | | |/| | | |||||
| * | | | | | Merge Percona patch MWL#47 into mariadb 5.2-percona. | unknown | 2011-01-10 | 1 | -1/+1 |
| |/ / / / | |||||
* | | | | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 1 | -2/+10 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | Merge from 5.1. | Guilhem Bichot | 2011-05-21 | 1 | -2/+2 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | Fix for BUG#11755168 '46895: test "outfile_loaddata" fails (reproducible)'. | Guilhem Bichot | 2011-05-16 | 1 | -2/+2 |
| | | |/ | | |/| | |||||
| * | | | Manual merge | unknown | 2010-11-28 | 1 | -0/+8 |
| |\ \ \ | | |/ / | |||||
| | * | | BUG#54903 BINLOG statement toggles session variables | unknown | 2010-11-28 | 1 | -0/+8 |
* | | | | merge. | Sergei Golubchik | 2010-11-25 | 1 | -2/+2 |
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | |||||
| * | | Merge with MySQL 5.1.49 | Michael Widenius | 2010-08-02 | 1 | -17/+12 |
| |\ \ | | |/ |