delta/mariadb-git.git/sql, branch preview-10.8-MDEV-14425-innodb github.com: MariaDB/server.git Merge 10.8 2022-01-04T09:16:03+00:00 Marko Mäkelä marko.makela@mariadb.com 2022-01-04T09:16:03+00:00 9898ce1153465c2cb802de32329e88706656eb66 






Merge 10.7 into 10.8
2022-01-04T08:30:45+00:00

Marko Mäkelä
marko.makela@mariadb.com

2022-01-04T08:30:45+00:00

daf4fa5238a67fcf47075721d86d4348adab687b












Merge 10.6 into 10.7
2022-01-04T07:55:58+00:00

Marko Mäkelä
marko.makela@mariadb.com

2022-01-04T07:55:58+00:00

7dfaded9625e832fade4ef1678bcb21c445dad2b












Merge 10.5 into 10.6
2022-01-04T07:26:38+00:00

Marko Mäkelä
marko.makela@mariadb.com

2022-01-04T07:26:38+00:00

3f5726768f17342fd6dfec1be1e4d71814bc8564












MDEV-27039 Trying to lock mutex ... when the mutex was already locked
2022-01-03T11:24:50+00:00

Andrei
andrei.elkin@mariadb.com

2021-12-27T10:36:51+00:00

30b917d34adc27e55a1326406a22e2a6d0a87817

The reason of the double lock was an extraneous ha_flush_logs().
Unlike the upstream it is unnecessary in Mariadb that exploits a binlog
checkpoint mechanism for not letting PURGE or RESET-MASTER to trouble
transaction recovery. That is in case should a trx
be prepared but its binlog file gone, the trx then is committed on disk too.
Those facts have been always verified by existing tests of

  binlog.binlog_{checkpoint,xa_recover}.test.

A regression test for the bug is included though.





The reason of the double lock was an extraneous ha_flush_logs().
Unlike the upstream it is unnecessary in Mariadb that exploits a binlog
checkpoint mechanism for not letting PURGE or RESET-MASTER to trouble
transaction recovery. That is in case should a trx
be prepared but its binlog file gone, the trx then is committed on disk too.
Those facts have been always verified by existing tests of

  binlog.binlog_{checkpoint,xa_recover}.test.

A regression test for the bug is included though.







Merge 10.4 into 10.5
2022-01-03T05:23:49+00:00

Marko Mäkelä
marko.makela@mariadb.com

2022-01-03T05:23:49+00:00

c9db50b585566b39d04218f4e0b746e0d1394dfb












Update errmsg-utf8.txt (spa)
2021-12-31T07:33:23+00:00

Jesús Marín
74543075+jesusaplsoftware@users.noreply.github.com

2020-12-29T11:59:01+00:00

3e0304884b45d143e4194b3244d6e77a663680fc

Cambiar mysql por maria





Cambiar mysql por maria







Add --valgrind to VERSION() string for valgrind builds
2021-12-28T14:37:14+00:00

Monty
monty@mariadb.org

2021-12-28T14:37:14+00:00

a48d2ec866751e9da76066bf3a30f99da9031ab0

Fixes main.sp-no-valgrind for valgrind builds not done with BUILD scripts





Fixes main.sp-no-valgrind for valgrind builds not done with BUILD scripts







MDEV-27304 SHOW ... result columns are right-aligned
2021-12-27T12:28:25+00:00

Sergei Golubchik
serg@mariadb.org

2021-12-24T21:16:10+00:00

89a0364fc88efa7d91d02839a25fa22e4b276995

--version=value was setting sys_var::CONFIG (meaning, the value
came from the config file), but the filename was left as NULL.





--version=value was setting sys_var::CONFIG (meaning, the value
came from the config file), but the filename was left as NULL.







Merge branch 10.4 into 10.5
2021-12-26T11:51:04+00:00

Julius Goryavsky
julius.goryavsky@mariadb.com

2021-12-26T11:51:04+00:00

55bb933a880bf048ebc4ce6c6e239dcc8268958d