Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 10.1 into 10.2 | Marko Mäkelä | 2018-06-26 | 1 | -4/+0 |
|\ | |||||
| * | Merge 10.0 into 10.1 | Marko Mäkelä | 2018-06-26 | 1 | -4/+0 |
| |\ | |||||
| | * | MDEV-15242 Poor RBR update performance with partitioned tables | Andrei Elkin | 2018-06-25 | 1 | -4/+0 |
* | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2018-06-21 | 1 | -20/+14 |
|\ \ \ | |/ / | |||||
| * | | MDEV-13577 slave_parallel_mode=optimistic should not report the mode's specif... | Sergei Golubchik | 2018-06-20 | 1 | -4/+14 |
| * | | Merge branch '10.0-galera' into 10.1 | Vicențiu Ciorbaru | 2018-06-12 | 1 | -16/+0 |
| |\ \ | |||||
| | * \ | Merge tag 'mariadb-10.0.35' into 10.0-galera | Jan Lindström | 2018-05-07 | 1 | -0/+34 |
| | |\ \ | | | |/ | |||||
| | * | | Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galera | Jan Lindström | 2018-05-07 | 1 | -5/+64 |
| | |\ \ | |||||
| | | * \ | Merge tag 'mariadb-5.5.60' into 5.5-galera | Jan Lindström | 2018-04-24 | 1 | -5/+115 |
| | | |\ \ | |||||
| | | * \ \ | Merge tag 'mariadb-5.5.58' into 5.5-galera | Jan Lindström | 2017-10-19 | 1 | -15/+0 |
| | | |\ \ \ | |||||
| | | * \ \ \ | Merge tag 'mariadb-5.5.50' into 5.5-galeramariadb-galera-5.5.50 | Nirbhay Choubey | 2016-06-23 | 1 | -7/+39 |
| | | |\ \ \ \ | |||||
| | | * \ \ \ \ | Merge tag 'mariadb-5.5.48' into 5.5-galera | Nirbhay Choubey | 2016-02-13 | 1 | -5/+5 |
| | | |\ \ \ \ \ | |||||
| | | * | | | | | | refs codership/mysql-wsrep#201 | Daniele Sciascia | 2016-02-10 | 1 | -1/+19 |
| | | * | | | | | | Merge tag 'mariadb-5.5.46' into 5.5-galera | Nirbhay Choubey | 2015-10-13 | 1 | -9/+4 |
| | | |\ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ | Merge tag 'mariadb-5.5.45' into 5.5-galera | Nirbhay Choubey | 2015-08-07 | 1 | -5/+7 |
| | | |\ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ | Merge tag 'mariadb-5.5.44' into 5.5-galera | Nirbhay Choubey | 2015-06-21 | 1 | -0/+6 |
| | | |\ \ \ \ \ \ \ \ | |||||
| | * | \ \ \ \ \ \ \ \ | Merge tag 'mariadb-10.0.34' into 10.0-galeramariadb-galera-10.0.34 | Jan Lindström | 2018-02-01 | 1 | -1/+6 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge tag 'mariadb-10.0.33' into bb-10.0-galerabb-10.0-sachin-galera | Sachin Setiya | 2017-11-03 | 1 | -15/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
* | | \ \ \ \ \ \ \ \ \ \ \ | Merge 10.1 into 10.2 | Marko Mäkelä | 2018-04-24 | 1 | -6/+113 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | Merge 10.0 into 10.1 | Marko Mäkelä | 2018-04-24 | 1 | -5/+113 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2018-04-20 | 1 | -5/+114 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / | | |/| | | | | | | | | | / | | | | |_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | |||||
| | | * | | | | | | | | | | Merge branch 'mysql/5.5' into 5.5 | Sergei Golubchik | 2018-04-19 | 1 | -5/+115 |
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | |||||
| | | | * | | | | | | | | | BUG#24365972 BINLOG DECODING ISN'T RESILIENT TO CORRUPT BINLOG FILES | Joao Gramacho | 2018-02-02 | 1 | -6/+120 |
| | | | * | | | | | | | | | Bug#12818255: READ-ONLY OPTION DOES NOT ALLOW | Sujatha Sivakumar | 2016-05-04 | 1 | -1/+2 |
| * | | | | | | | | | | | | MDEV-14721 Big transaction events get lost on semisync master when | Andrei Elkin | 2018-03-12 | 1 | -0/+2 |
* | | | | | | | | | | | | | Merge branch 'github/10.1' into 10.2 | Sergei Golubchik | 2018-02-06 | 1 | -1/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | Merge branch 'github/10.0' into 10.1 | Sergei Golubchik | 2018-02-02 | 1 | -1/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |||||
| | * | | | | | | | | | | | Fix for MDEV-14141 Crash in print_keydup_error() | Monty | 2018-01-24 | 1 | -1/+6 |
| | | |_|_|/ / / / / / / | | |/| | | | | | | | | | |||||
* | | | | | | | | | | | | MDEV-14721 Big transaction events get lost on semisync master when | Andrei Elkin | 2018-01-27 | 1 | -0/+2 |
* | | | | | | | | | | | | Windows : fix compile warnings C4267, on 32bit first | Vladislav Vaintroub | 2018-01-26 | 1 | -1/+2 |
* | | | | | | | | | | | | Compilation speed (#546) | Eugene Kosov | 2018-01-14 | 1 | -4/+2 |
* | | | | | | | | | | | | Fixed wrong arguments to printf and related functions | Monty | 2018-01-04 | 1 | -4/+5 |
* | | | | | | | | | | | | Fix a type mismatch introduced by the merge commit e0a1c745ec3ed1ec6c0375a2a6... | Marko Mäkelä | 2017-10-30 | 1 | -1/+1 |
* | | | | | | | | | | | | Fix a warning on Win64 | Vladislav Vaintroub | 2017-10-24 | 1 | -1/+1 |
* | | | | | | | | | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-10-24 | 1 | -16/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | |||||
| * | | | | | | | | | | | Various compier warnings | Sergei Golubchik | 2017-10-22 | 1 | -2/+2 |
| * | | | | | | | | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2017-10-22 | 1 | -15/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |||||
| | * | | | | | | | | | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2017-10-18 | 1 | -15/+0 |
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | |||||
| | | * | | | | | | | | | MDEV-13459 Warnings, when compiling with gcc-7.x | Sergei Golubchik | 2017-10-17 | 1 | -15/+0 |
| | | | |_|_|_|_|_|_|/ | | | |/| | | | | | | | |||||
* | | | | | | | | | | | Windows : Fix truncation warnings in sql/ | Vladislav Vaintroub | 2017-10-10 | 1 | -10/+10 |
* | | | | | | | | | | | cppcheck harmless warnings | Sergei Golubchik | 2017-10-04 | 1 | -1/+1 |
* | | | | | | | | | | | MDEV-13384 - misc Windows warnings fixed | Vladislav Vaintroub | 2017-09-28 | 1 | -18/+18 |
* | | | | | | | | | | | MDEV-13844 : Fix Windows warnings. Fix DBUG_PRINT. | Vladislav Vaintroub | 2017-09-28 | 1 | -9/+9 |
* | | | | | | | | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-08-17 | 1 | -14/+7 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | |||||
| * | | | | | | | | | | MDEV-13179 main.errors fails with wrong errno | Monty | 2017-08-07 | 1 | -14/+7 |
* | | | | | | | | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-07-05 | 1 | -2/+4 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | |||||
| * | | | | | | | | | | MDEV-8075: DROP TEMPORARY TABLE not marked as ddl, causing optimistic paralle... | Kristian Nielsen | 2017-07-03 | 1 | -2/+4 |
* | | | | | | | | | | | MDEV-12067 flashback does not correcly revert update/replace statementsbb-10.2-MDEV-12067 | Lixun Peng | 2017-07-03 | 1 | -12/+15 |
* | | | | | | | | | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2017-06-08 | 1 | -1/+0 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | |||||
| * | | | | | | | | | | Merge branch '10.0-galera' into 10.1 | Sergei Golubchik | 2017-05-26 | 1 | -1/+0 |
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | | |