Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 10.2 into 10.3 | Marko Mäkelä | 2019-05-14 | 1 | -1/+1 |
|\ | |||||
| * | Merge 10.1 into 10.2 | Marko Mäkelä | 2019-05-13 | 1 | -1/+1 |
| |\ | |||||
| | * | Merge branch '5.5' into 10.1 | Vicențiu Ciorbaru | 2019-05-11 | 1 | -1/+1 |
| | |\ | |||||
| | | * | Update FSF Address | Vicențiu Ciorbaru | 2019-05-11 | 1 | -1/+1 |
* | | | | Add likely/unlikely to speed up execution | Monty | 2018-05-07 | 1 | -1/+2 |
* | | | | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3 | Alexander Barkov | 2017-10-30 | 1 | -3/+3 |
|\ \ \ \ | |||||
| * \ \ \ | Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext | Alexander Barkov | 2017-10-18 | 1 | -3/+3 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Windows : Fix truncation warnings in sql/ | Vladislav Vaintroub | 2017-10-10 | 1 | -3/+3 |
* | | | | | Merge bb-10.2-ext into 10.3 | Marko Mäkelä | 2017-10-04 | 1 | -9/+9 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext | Alexander Barkov | 2017-10-02 | 1 | -9/+9 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | MDEV-13384 - misc Windows warnings fixed | Vladislav Vaintroub | 2017-09-28 | 1 | -2/+2 |
| | * | | | MDEV-13844 : Fix Windows warnings. Fix DBUG_PRINT. | Vladislav Vaintroub | 2017-09-28 | 1 | -7/+7 |
* | | | | | Enusure that my_global.h is included first | Michael Widenius | 2017-08-24 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Changing field::field_name and Item::name to LEX_CSTRING | Monty | 2017-04-23 | 1 | -9/+9 |
|/ / / | |||||
* | | | Merge 10.1 to 10.2 | Marko Mäkelä | 2017-01-05 | 1 | -2/+1 |
|\ \ \ | |/ / | |||||
| * | | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-01-04 | 1 | -2/+1 |
| |\ \ | |||||
| | * | | MDEV-11636 Extra persistent columns on slave always gets NULL in RBR | Sachin Setiya | 2017-01-01 | 1 | -0/+31 |
| * | | | MDEV-11636 Extra persistent columns on slave always gets NULL in RBR | Sachin Setiya | 2017-01-01 | 1 | -0/+32 |
* | | | | MDEV-11636 Extra persistent columns on slave always gets NULL in RBR | Sachin Setiya | 2017-01-01 | 1 | -0/+32 |
|/ / / | |||||
* | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-03-21 | 1 | -2/+2 |
|\ \ \ | |/ / | |||||
| * | | MDEV-9560 Mariadb 10.1 Crashes when replicating from 10.0 | Sergei Golubchik | 2016-03-21 | 1 | -2/+2 |
* | | | table->write_set was changed if binary logging was used, which caused the | Monty | 2015-11-10 | 1 | -3/+2 |
* | | | Merge branch '10.1' of github.com:MariaDB/server into 10.1 | Monty | 2015-07-09 | 1 | -0/+10 |
|\ \ \ | |||||
| * | | | [MDEV-6877] Change replication event loop to account for empty events10.1-MDEV-6877-binlog_row_image | Vicențiu Ciorbaru | 2015-06-30 | 1 | -0/+10 |
* | | | | - Renaming variables so that they don't shadow others (After this patch one c... | Monty | 2015-07-06 | 1 | -4/+8 |
|/ / / | |||||
* | | | Merge branch '10.0' into bb-10.1-merge | Sergei Golubchik | 2014-12-02 | 1 | -0/+1 |
|\ \ \ | |/ / | |||||
| * | | MDEV-5120 Test suite test maria-no-logging fails | Michael Widenius | 2014-09-30 | 1 | -0/+1 |
* | | | Merge 10.0.14 into 10.1 | Sergei Golubchik | 2014-10-15 | 1 | -0/+1 |
|\ \ \ | |/ / | |||||
| * | | MDEV-6120: When slave stops with error, error message should indicate the fai... | Kristian Nielsen | 2014-07-07 | 1 | -0/+1 |
* | | | cleanup: galera merge, simple changes | Sergei Golubchik | 2014-10-01 | 1 | -2/+0 |
* | | | MDEV-6247: Merge 10.0-galera to 10.1. | Jan Lindström | 2014-08-26 | 1 | -2/+19 |
|/ / | |||||
* | | 10.0-base merge | Sergei Golubchik | 2014-02-26 | 1 | -10/+13 |
|\ \ | |||||
| * \ | 5.5 merge | Sergei Golubchik | 2014-02-25 | 1 | -10/+13 |
| |\ \ | | |/ | |||||
| | * | MySQL-5.5.36 merge | Sergei Golubchik | 2014-02-17 | 1 | -10/+13 |
| | |\ | |||||
| | | * | Bug#17632978 SLAVE CRASHES IF ROW EVENT IS CORRUPTED | Venkatesh Duggirala | 2013-12-17 | 1 | -5/+22 |
* | | | | Merge from 10.0-base to 10.0 the feature MDEV-4506: Parallel replication. | unknown | 2013-11-01 | 1 | -5/+5 |
|\ \ \ \ | |/ / / | |||||
| * | | | MDEV-4506: parallel replication. | unknown | 2013-09-16 | 1 | -5/+5 |
| |/ / | |||||
* | | | Applied all changes from Igor and Sanja | Michael Widenius | 2013-06-15 | 1 | -2/+2 |
* | | | Temporary commit of 10.0-merge | Michael Widenius | 2013-03-26 | 1 | -1/+1 |
|/ / | |||||
* | | Split ER_NO_SUCH_TABLE into ER_NO_SUCH_TABLE and ER_NO_SUCH_TABLE_IN_ENGINE t... | Michael Widenius | 2012-08-28 | 1 | -1/+1 |
* | | Merge from 5.3 | unknown | 2012-08-24 | 1 | -1/+1 |
|\ \ | |||||
* \ \ | Merge 5.3->5.5 | Igor Babaev | 2012-03-17 | 1 | -5/+13 |
|\ \ \ | |/ / | |||||
| * | | Fixed bug lp:917689 "Archive table corruption crashing MariaDB signal 11" | Michael Widenius | 2012-03-13 | 1 | -7/+13 |
* | | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -1/+3 |
|\ \ \ | |/ / | |||||
| * | | Merge with 5.2. | Michael Widenius | 2011-12-11 | 1 | -2/+5 |
| |\ \ | |||||
| | * \ | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -2/+5 |
| | |\ \ | |||||
* | | \ \ | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 1 | -2/+2 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+2 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+4 |
* | | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -3/+3 |
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| | |