diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-12-01 11:04:58 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-12-01 11:04:58 +0200 |
| commit | 7487c313bc1d6ce1a525002745105bd076f4fcba (patch) | |
| tree | 8efa892fbe6bebc98ca106cf4341d406b48cb7ea /mysys | |
| parent | 4eb8e51c269eb9447d3765a6e4deba0dc68dfa37 (diff) | |
| parent | 07a06022c4e63adc360b42775934f35fa1df5a79 (diff) | |
| download | mariadb-git-7487c313bc1d6ce1a525002745105bd076f4fcba.tar.gz | |
Merge 10.4 into 10.5
This fixes up 4eb8e51c269eb9447d3765a6e4deba0dc68dfa37
which missed a second parent.
Diffstat (limited to 'mysys')
0 files changed, 0 insertions, 0 deletions