Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 10.5 into 10.6 | Marko Mäkelä | 2023-03-22 | 10 | -51/+51 |
|\ | |||||
| * | [MDEV-30824] Fix binlog to use 'String' for setting 'character_set_client' | Tingyao Nian | 2023-03-21 | 10 | -51/+51 |
| * | Merge mariadb-10.5.19 into 10.5 | Marko Mäkelä | 2023-02-06 | 2 | -0/+145 |
| |\ | |||||
* | \ | Merge branch '10.5' into 10.6 | Oleksandr Byelkin | 2023-01-31 | 2 | -0/+145 |
|\ \ \ | | |/ | |/| | |||||
| * | | MDEV-30940: Revert "binlog.innodb_rc_insert_before_delete is disabled with MD...mariadb-10.5.19 | Andrei | 2023-01-30 | 2 | -1/+3 |
| * | | binlog.innodb_rc_insert_before_delete is disabled with MDEV-30490 | Andrei | 2023-01-30 | 1 | -0/+1 |
| * | | Merge branch '10.4' into 10.5 | Oleksandr Byelkin | 2023-01-30 | 3 | -9/+52 |
| |\ \ | |||||
| | * \ | Merge branch '10.3' into 10.4 | Oleksandr Byelkin | 2023-01-28 | 2 | -0/+141 |
| | |\ \ | |||||
| | | * | | MDEV-30010 post-push: fixing test results.mariadb-10.3.38 | Andrei | 2023-01-28 | 2 | -8/+52 |
| * | | | | binlog.innodb_rc_insert_before_delete is disabled with MDEV-30490 | Andrei | 2023-01-28 | 1 | -0/+1 |
| * | | | | Merge branch '10.4' into 10.5 | Oleksandr Byelkin | 2023-01-27 | 2 | -0/+97 |
| |\ \ \ \ | | |_|_|/ | |/| | | | |||||
| | * | | | Merge branch '10.3' into 10.4 | Oleksandr Byelkin | 2023-01-26 | 2 | -0/+97 |
| | |\ \ \ | | | |/ / | | |/| / | | | |/ | |||||
| | | * | MDEV-30010 Slave (additional info): Commit failed due to failure of an earlie... | Andrei | 2023-01-24 | 2 | -0/+97 |
* | | | | Merge 10.5 into 10.6 | Marko Mäkelä | 2023-01-13 | 2 | -0/+85 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge 10.4 into 10.5 | Marko Mäkelä | 2023-01-13 | 2 | -0/+85 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge 10.3 into 10.4 | Marko Mäkelä | 2023-01-13 | 2 | -0/+85 |
| | |\ \ | | | |/ | |||||
| | | * | MDEV-25277: mysqlbinlog --verbose cannot read row events with compressed colu... | Brandon Nesterenko | 2023-01-11 | 2 | -0/+85 |
* | | | | Merge 10.5 into 10.6 | Marko Mäkelä | 2022-12-13 | 8 | -3/+8 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge 10.4 into 10.5 | Marko Mäkelä | 2022-12-13 | 8 | -3/+8 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge 10.3 into 10.4 | Marko Mäkelä | 2022-12-13 | 8 | -3/+8 |
| | |\ \ | | | |/ | |||||
| | | * | MDEV 28970: Add RESET MASTER to clear possible remaining binlog from previous... | asklavou | 2022-11-09 | 8 | -4/+8 |
* | | | | Merge 10.5 into 10.6 | Marko Mäkelä | 2022-11-28 | 2 | -23/+20 |
|\ \ \ \ | |/ / / | |||||
| * | | | MDEV-29607: binlog.binlog_checkpoint fails in buildbot with result content mi... | Brandon Nesterenko | 2022-11-25 | 2 | -23/+20 |
* | | | | Merge 10.5 into 10.6 | Marko Mäkelä | 2022-11-10 | 8 | -1/+8 |
|\ \ \ \ | |/ / / | |||||
| * | | | MDEV-29866: Add RESET MASTER to clear possible remaining binlog from previous... | asklavou | 2022-11-09 | 6 | -0/+6 |
| * | | | MDEV-28970: Add RESET MASTER to clear possible remaining binlog from previous... | asklavou | 2022-11-09 | 2 | -1/+2 |
* | | | | Merge branch '10.5' into 10.6 | Oleksandr Byelkin | 2022-11-02 | 2 | -0/+160 |
|\ \ \ \ | |/ / / | |||||
| * | | | MDEV-25616 XA PREPARE event group is not binlogged when.. | Brandon Nesterenko | 2022-10-25 | 2 | -0/+160 |
* | | | | update the test after merge | Sergei Golubchik | 2022-09-30 | 2 | -2/+2 |
* | | | | Merge 10.5 into 10.6 | Marko Mäkelä | 2022-09-20 | 4 | -5/+5 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge remote-tracking branch 'origin/10.4' into 10.5 | Alexander Barkov | 2022-09-14 | 4 | -5/+5 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge 10.3 into 10.4 | Marko Mäkelä | 2022-09-13 | 3 | -4/+4 |
| | |\ \ | | | |/ | |||||
| | | * | MDEV-29446 Change SHOW CREATE TABLE to display default collation | Alexander Barkov | 2022-09-12 | 3 | -4/+4 |
* | | | | Merge 10.5 into 10.6 | Marko Mäkelä | 2022-09-12 | 2 | -9/+96 |
|\ \ \ \ | |/ / / | |||||
| * | | | MDEV-24660 MYSQL_BIN_LOG::cleanup(): Assertion `b->xid_count == 0' | Andrei | 2022-09-09 | 2 | -9/+96 |
* | | | | Merge branch '10.5' into bb-10.6-release | Oleksandr Byelkin | 2022-08-03 | 11 | -61/+61 |
|\ \ \ \ | |/ / / | |||||
| * | | | MDEV-29078 For old binary logs explicit_defaults_for_timestamp presumed to be... | Sergei Golubchik | 2022-08-02 | 1 | -1/+1 |
| * | | | MDEV-29225 make explicit_defaults_for_timestamps SESSION variable | Sergei Golubchik | 2022-08-02 | 11 | -61/+61 |
* | | | | Merge 10.5 into 10.6 | Marko Mäkelä | 2022-07-27 | 4 | -1/+5 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge 10.4 into 10.5 | Marko Mäkelä | 2022-07-27 | 4 | -1/+5 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge branch '10.3' into 10.4 | Oleksandr Byelkin | 2022-07-27 | 4 | -1/+5 |
| | |\ \ | | | |/ | |||||
| | | * | MDEV-21087/MDEV-21433: ER_SLAVE_INCIDENT arrives at slave without failure spe... | Brandon Nesterenko | 2022-07-25 | 4 | -1/+5 |
| * | | | MDEV-28948 FLUSH BINARY LOGS waits/hangs on mysql_mutex_unlock(&LOCK_index) | Andrei | 2022-07-26 | 2 | -0/+73 |
* | | | | MDEV-28461 semisync-slave server recovery fails to rollback prepared transaction | Andrei | 2022-05-18 | 5 | -23/+108 |
* | | | | Merge branch '10.5' into 10.6 | Sergei Golubchik | 2022-05-10 | 1 | -6/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch '10.4' into 10.5 | Sergei Golubchik | 2022-05-09 | 1 | -6/+1 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge branch '10.3' into 10.4 | Sergei Golubchik | 2022-05-08 | 1 | -6/+1 |
| | |\ \ | | | |/ | |||||
| | | * | test fixes for FreeBSD | Sergei Golubchik | 2022-05-04 | 1 | -6/+1 |
* | | | | Merge 10.5 into 10.6 | Marko Mäkelä | 2022-04-21 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch 10.4 into 10.5 | Daniel Black | 2022-04-21 | 1 | -1/+1 |
| |\ \ \ | | |/ / |