Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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.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.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 |
| | |_|_|/ / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | 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 |
| | | |_|_|_|_|_|_|/ | | |/| | | | | | | | |||||
* | | | | | | | | | | MDEV-13179 main.errors fails with wrong errno | Monty | 2017-08-07 | 1 | -14/+7 |
* | | | | | | | | | | MDEV-8075: DROP TEMPORARY TABLE not marked as ddl, causing optimistic paralle... | Kristian Nielsen | 2017-07-03 | 1 | -2/+4 |
* | | | | | | | | | | Merge branch '10.0-galera' into 10.1 | Sergei Golubchik | 2017-05-26 | 1 | -1/+0 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | Merge tag 'mariadb-10.0.30' into bb-sachin-10.0-galera-merge | Sachin Setiya | 2017-03-17 | 1 | -7/+11 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |||||
| * | | | | | | | | | Fix wsrep_affected_rows. | Sachin Setiya | 2017-03-16 | 1 | -0/+4 |
| * | | | | | | | | | Merge tag 'mariadb-10.0.29' into 10.0-galera | Nirbhay Choubey | 2017-01-13 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge tag 'mariadb-10.0.26' into 10.0-galera | Nirbhay Choubey | 2016-06-24 | 1 | -9/+54 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch '10.0' into 10.0-galera | Nirbhay Choubey | 2016-04-29 | 1 | -4/+7 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
* | | | | | | | | | | | | | Fix build on windows | Sachin Setiya | 2017-04-06 | 1 | -1/+2 |
* | | | | | | | | | | | | | MW-313 Enforce wsrep_max_ws_rows also when binlog is enabled | Sachin Setiya | 2017-04-06 | 1 | -0/+4 |
* | | | | | | | | | | | | | base64 service | Sergei Golubchik | 2017-03-10 | 1 | -1/+0 |
* | | | | | | | | | | | | | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-03-03 | 1 | -7/+10 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Added error checking for all calls to flush_relay_log_info() and stmt_done() | Monty | 2017-02-28 | 1 | -7/+10 |
* | | | | | | | | | | | | | Revert "MDEV-7409 On RBR, extend the PROCESSLIST info to include at least the... | Sachin Setiya | 2017-01-25 | 1 | -63/+20 |
* | | | | | | | | | | | | | MDEV-7409 On RBR, extend the PROCESSLIST info to include at least the name of... | Sachin Setiya | 2017-01-23 | 1 | -20/+63 |
* | | | | | | | | | | | | | Merge branch '10.0' into 10.1 | Kristian Nielsen | 2017-01-17 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | MDEV-11811: dual master with parallel replication memory leak in write master | Kristian Nielsen | 2017-01-17 | 1 | -0/+1 |
| | |_|_|/ / / / / / / / | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | Back-port Master_info::using_parallel() to 10.0. | Kristian Nielsen | 2016-11-15 | 1 | -1/+1 |
| | |_|/ / / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | MDEV-11319 mysqlbinlog crashes or fails with out of memory while reading some... | Sergei Golubchik | 2016-12-06 | 1 | -2/+11 |
* | | | | | | | | | | | MDEV-10545: Server crashed in my_copy_fix_mb on querying I_S and P_S tables | Nirbhay Choubey | 2016-09-02 | 1 | -1/+0 |
* | | | | | | | | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-06-28 | 1 | -9/+54 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | |||||
| * | | | | | | | | | | MDEV-8638: REVOKE ALL PRIVILEGES, GRANT OPTION FROM CURRENT_ROLE breaks repli... | Vicențiu Ciorbaru | 2016-06-22 | 1 | -2/+17 |
| * | | | | | | | | | | Merge branch '5.5' into bb-10.0 | Sergei Golubchik | 2016-06-21 | 1 | -7/+37 |
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | / / / / / / / | | | |/ / / / / / / | | |/| | | | | | | | |||||
| | * | | | | | | | | Merge branch 'mysql/5.5' into 5.5 | Sergei Golubchik | 2016-06-14 | 1 | -7/+39 |
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | / | | | |_|_|_|_|_|/ | | |/| | | | | | | |||||
| | | * | | | | | | BUG#17018343 SLAVE CRASHES WHEN APPLYING ROW-BASED BINLOG ENTRIES IN CASCADING | Venkatesh Duggirala | 2016-03-01 | 1 | -7/+39 |