[Maria-discuss] 10.2.7 and xtradb in changelog
https://mariadb.com/kb/en/mariadb/mariadb-1027-changelog/ i thought xtradb is gone in 10.2.x is it back now with 10.2.7 or is the changelog a random wild mix of commits with no context to the version of the release? ______________________________ Revision #546a89ca58 2017-05-18 16:16:18 +0300 Update xtradb and innodb version to 5.6.36 Revision #f880200974 2017-05-20 17:47:07 +0300 After-merge fix: Correct the 32-bit XtraDB result diff. Revision #fe291c687d 2017-05-20 08:43:25 +0300 After-merge fix: Correct the XtraDB result diff. Revision #4df726e180 2017-07-10 00:05:06 +0300 storage_engine subsuites should also be disabled for XtraDB
Hi, Reindl! On Jul 13, Reindl Harald wrote:
https://mariadb.com/kb/en/mariadb/mariadb-1027-changelog/
i thought xtradb is gone in 10.2.x
is it back now with 10.2.7 or is the changelog a random wild mix of commits with no context to the version of the release?
Neither. Changelog is generated as "all commits that are present in the 10.2.7 history, but were not present in the 10.2.6 history". And all commits in 10.1 are merged into 10.2 eventually (because many 10.1 bugfixes apply to 10.2 too). So whatever was done to XtraDB in 10.1 it will be part of 10.2 revision history, even though XtraDB itself is disabled in 10.2 (and does not even compile there). I agree that it's confusing, but what can we do? Manually filter out all commits that contain the string "xtradb" from the changelog?
Revision #546a89ca58 2017-05-18 16:16:18 +0300 Update xtradb and innodb version to 5.6.36
Revision #f880200974 2017-05-20 17:47:07 +0300 After-merge fix: Correct the 32-bit XtraDB result diff.
Revision #fe291c687d 2017-05-20 08:43:25 +0300 After-merge fix: Correct the XtraDB result diff.
Revision #4df726e180 2017-07-10 00:05:06 +0300 storage_engine subsuites should also be disabled for XtraDB
Regards, Sergei Chief Architect MariaDB and security@mariadb.org
Am 13.07.2017 um 11:55 schrieb Sergei Golubchik:
Hi, Reindl!
On Jul 13, Reindl Harald wrote:
https://mariadb.com/kb/en/mariadb/mariadb-1027-changelog/
i thought xtradb is gone in 10.2.x
is it back now with 10.2.7 or is the changelog a random wild mix of commits with no context to the version of the release?
Neither. Changelog is generated as "all commits that are present in the 10.2.7 history, but were not present in the 10.2.6 history". And all commits in 10.1 are merged into 10.2 eventually (because many 10.1 bugfixes apply to 10.2 too).
So whatever was done to XtraDB in 10.1 it will be part of 10.2 revision history, even though XtraDB itself is disabled in 10.2 (and does not even compile there).
I agree that it's confusing, but what can we do? Manually filter out all commits that contain the string "xtradb" from the changelog?
well, at least some filters make sense because things like "Update xtradb and innodb version to 5.6.36" are pure nonsense when innodb in 10.2 AFAIK is 5.7 and so the complete changelog feels very useless and instead beeing helpful it spreads doubt how that whole stuff works at all when random pieces seems to get merged bewteen versions or at least the changelog says so
Hi, Reindl! On Jul 13, Reindl Harald wrote:
Am 13.07.2017 um 11:55 schrieb Sergei Golubchik:
On Jul 13, Reindl Harald wrote:
https://mariadb.com/kb/en/mariadb/mariadb-1027-changelog/
i thought xtradb is gone in 10.2.x
is it back now with 10.2.7 or is the changelog a random wild mix of commits with no context to the version of the release?
Neither. Changelog is generated as "all commits that are present in the 10.2.7 history, but were not present in the 10.2.6 history". And all commits in 10.1 are merged into 10.2 eventually (because many 10.1 bugfixes apply to 10.2 too).
So whatever was done to XtraDB in 10.1 it will be part of 10.2 revision history, even though XtraDB itself is disabled in 10.2 (and does not even compile there).
I agree that it's confusing, but what can we do? Manually filter out all commits that contain the string "xtradb" from the changelog?
well, at least some filters make sense because things like "Update xtradb and innodb version to 5.6.36" are pure nonsense when innodb in 10.2 AFAIK is 5.7 and so the complete changelog feels very useless and instead beeing helpful it spreads doubt how that whole stuff works at all when random pieces seems to get merged bewteen versions or at least the changelog says so
Okay. https://jira.mariadb.org/browse/MDEV-13312 Regards, Sergei Chief Architect MariaDB and security@mariadb.org
Hi Sergei, Reindl, Le 13/07/2017 à 12:35, Sergei Golubchik a écrit :
Hi, Reindl!
On Jul 13, Reindl Harald wrote:
On Jul 13, Reindl Harald wrote:
https://mariadb.com/kb/en/mariadb/mariadb-1027-changelog/
i thought xtradb is gone in 10.2.x
is it back now with 10.2.7 or is the changelog a random wild mix of commits with no context to the version of the release? Neither. Changelog is generated as "all commits that are present in the 10.2.7 history, but were not present in the 10.2.6 history". And all commits in 10.1 are merged into 10.2 eventually (because many 10.1 bugfixes apply to 10.2 too).
So whatever was done to XtraDB in 10.1 it will be part of 10.2 revision history, even though XtraDB itself is disabled in 10.2 (and does not even compile there).
I agree that it's confusing, but what can we do? Manually filter out all commits that contain the string "xtradb" from the changelog? well, at least some filters make sense because things like "Update xtradb and innodb version to 5.6.36" are pure nonsense when innodb in 10.2 AFAIK is 5.7 and so the complete changelog feels very useless and instead beeing helpful it spreads doubt how that whole stuff works at all when random pieces seems to get merged bewteen versions or at least
Am 13.07.2017 um 11:55 schrieb Sergei Golubchik: the changelog says so Okay. https://jira.mariadb.org/browse/MDEV-13312
Perhaps it would make sense to squash merges from the 10.1 branch into one commit, and make a "merge 10.1.x branch" + url reference to the changelog of 10.1.x in the commit message? Jocelyn
Am 13.07.2017 um 12:42 schrieb jocelyn fournier:
Hi Sergei, Reindl,
Le 13/07/2017 à 12:35, Sergei Golubchik a écrit :
Hi, Reindl!
On Jul 13, Reindl Harald wrote:
On Jul 13, Reindl Harald wrote:
https://mariadb.com/kb/en/mariadb/mariadb-1027-changelog/
i thought xtradb is gone in 10.2.x
is it back now with 10.2.7 or is the changelog a random wild mix of commits with no context to the version of the release? Neither. Changelog is generated as "all commits that are present in the 10.2.7 history, but were not present in the 10.2.6 history". And all commits in 10.1 are merged into 10.2 eventually (because many 10.1 bugfixes apply to 10.2 too).
So whatever was done to XtraDB in 10.1 it will be part of 10.2 revision history, even though XtraDB itself is disabled in 10.2 (and does not even compile there).
I agree that it's confusing, but what can we do? Manually filter out all commits that contain the string "xtradb" from the changelog? well, at least some filters make sense because things like "Update xtradb and innodb version to 5.6.36" are pure nonsense when innodb in 10.2 AFAIK is 5.7 and so the complete changelog feels very useless and instead beeing helpful it spreads doubt how that whole stuff works at all when random pieces seems to get merged bewteen versions or at least
Am 13.07.2017 um 11:55 schrieb Sergei Golubchik: the changelog says so Okay. https://jira.mariadb.org/browse/MDEV-13312
Perhaps it would make sense to squash merges from the 10.1 branch into one commit, and make a "merge 10.1.x branch" + url reference to the changelog of 10.1.x in the commit message?
i guess there is a reason why PHP maintains the "NEWS" file by hand.... you really need to distinct between users and developers here and the changelog should not be such a long for nobody outside the project understandable desert of text
participants (3)
-
jocelyn fournier -
Reindl Harald -
Sergei Golubchik