------------------------------------------------------------
revno: 3060.2.8
tags: mysql-6.0.10
revision-id: <email address hidden>
parent: <email address hidden>
committer: Jonathan Perkin <email address hidden>
branch nick: mysql-6.0.10-alpha-release
timestamp: Tue 2009-03-03 17:53:18 +0100
message:
DBUG_* must come with variable definitions to satisfy compilers which require
that they are all defined together.
------------------------------------------------------------
revno: 3060.2.7
revision-id: <email address hidden>
parent: <email address hidden>
committer: Jonathan Perkin <email address hidden>
branch nick: mysql-6.0.10-alpha-release
timestamp: Tue 2009-03-03 10:59:32 +0100
message:
Fix previous, missed an #endif
------------------------------------------------------------
revno: 3060.2.6
revision-id: <email address hidden>
parent: <email address hidden>
committer: Jonathan Perkin <email address hidden>
branch nick: mysql-6.0.10-alpha-release
timestamp: Mon 2009-03-02 22:52:37 +0100
message:
Re-commit changes lost in previous merge.
------------------------------------------------------------
revno: 3060.2.5
revision-id: <email address hidden>
parent: <email address hidden>
committer: Jonathan Perkin <email address hidden>
branch nick: mysql-6.0.10-alpha-release
timestamp: Mon 2009-03-02 18:03:28 +0100
message:
Avoid 'directives may not be used inside a macro argument' error.
------------------------------------------------------------
revno: 3060.2.4
revision-id: <email address hidden>
parent: <email address hidden>
committer: Jonathan Perkin <email address hidden>
branch nick: mysql-6.0.10-alpha-release
timestamp: Fri 2009-02-27 14:38:57 +0100
message:
- more C++ comment fixes in C files.
- don't redefine TRUE/FALSE
------------------------------------------------------------
revno: 3060.2.3
revision-id: <email address hidden>
parent: <email address hidden>
committer: Jonathan Perkin <email address hidden>
branch nick: mysql-6.0.10-alpha-release
timestamp: Fri 2009-02-27 14:02:40 +0100
message:
No C++ comments in C header files.
------------------------------------------------------------
revno: 3060.2.2 [merge]
revision-id: <email address hidden>
parent: <email address hidden>
parent: <email address hidden>
committer: Jonathan Perkin <email address hidden>
branch nick: mysql-6.0.10-alpha-release
timestamp: Mon 2009-02-23 12:55:35 +0100
message:
Merge in changes from 6.0.9-release, with the additional change of installing the audit_null plugin
in RPMs.
------------------------------------------------------------
revno: 2617.33.11
tags: mysql-6.0.9
revision-id: <email address hidden>
parent: <email address hidden>
committer: Jonathan Perkin <email address hidden>
branch nick: mysql-6.0.9-alpha-release
timestamp: Sat 2009-01-10 13:01:39 +0100
message:
Add a bunch of missing files to the RPMs. Note that the audit_null plugin
is still missing, as it is currently installed in the wrong location and
there isn't time to change that for 6.0.9 release. This will be fixed
for the next release and added to the RPM.
This says that there is such path in the revision graph (the letters are the last letters of each revid):
Note that all revisions from nr2 to 93r are non-merge revisions, except nxw.
I can inspect the changes done by non-merge revisions (lh2 0ce 9jd t73 zyv 93r) easily ("bzr diff -c revid:etc"), and they are all very small diffs (thus they cannot explain the huge code diff between 6.0.9 and 6.0.10).
Now I inspect the only merge revision on the path: nxw. "bzr diff -c" is very small again, likely because the diff is implicitely done against the first parent (3ei) (see https://bugs.launchpad.net/bzr/+bug/475451). But the diff between nxw and the second parent (nr2) is huge. And that diff cannot be caused only by what is directly in 3ei (3ei has a small diff), it's caused by some 3ei's ancestors: the merge (nxw) didn't merge only 3ei, it merged lots of other revisions, which "bzr log -n0" does *not* print. To me it should print them, as they are part of what was incorporated over 6.0.9 to reach 6.0.10.
Additional debug info.
bzr log -n0 --show-ids tag:mysql- 6.0.9.. mysql-6. 0.10 :
------- ------- ------- ------- ------- ------- ------- ------- ---- 0.10-alpha- release ------- ------- ------- ------- ------- ------- ------- ---- 0.10-alpha- release ------- ------- ------- ------- ------- ------- ------- ---- 0.10-alpha- release ------- ------- ------- ------- ------- ------- ------- ---- 0.10-alpha- release ------- ------- ------- ------- ------- ------- ------- ---- 0.10-alpha- release ------- ------- ------- ------- ------- ------- ------- ---- 0.10-alpha- release ------- ------- ------- ------- ------- ------- ------- ---- 0.10-alpha- release ------- ------- ------- ------- ------- ------- ------- ------- - 0.9-alpha- release
revno: 3060.2.8
tags: mysql-6.0.10
revision-id: <email address hidden>
parent: <email address hidden>
committer: Jonathan Perkin <email address hidden>
branch nick: mysql-6.
timestamp: Tue 2009-03-03 17:53:18 +0100
message:
DBUG_* must come with variable definitions to satisfy compilers which require
that they are all defined together.
-------
revno: 3060.2.7
revision-id: <email address hidden>
parent: <email address hidden>
committer: Jonathan Perkin <email address hidden>
branch nick: mysql-6.
timestamp: Tue 2009-03-03 10:59:32 +0100
message:
Fix previous, missed an #endif
-------
revno: 3060.2.6
revision-id: <email address hidden>
parent: <email address hidden>
committer: Jonathan Perkin <email address hidden>
branch nick: mysql-6.
timestamp: Mon 2009-03-02 22:52:37 +0100
message:
Re-commit changes lost in previous merge.
-------
revno: 3060.2.5
revision-id: <email address hidden>
parent: <email address hidden>
committer: Jonathan Perkin <email address hidden>
branch nick: mysql-6.
timestamp: Mon 2009-03-02 18:03:28 +0100
message:
Avoid 'directives may not be used inside a macro argument' error.
-------
revno: 3060.2.4
revision-id: <email address hidden>
parent: <email address hidden>
committer: Jonathan Perkin <email address hidden>
branch nick: mysql-6.
timestamp: Fri 2009-02-27 14:38:57 +0100
message:
- more C++ comment fixes in C files.
- don't redefine TRUE/FALSE
-------
revno: 3060.2.3
revision-id: <email address hidden>
parent: <email address hidden>
committer: Jonathan Perkin <email address hidden>
branch nick: mysql-6.
timestamp: Fri 2009-02-27 14:02:40 +0100
message:
No C++ comments in C header files.
-------
revno: 3060.2.2 [merge]
revision-id: <email address hidden>
parent: <email address hidden>
parent: <email address hidden>
committer: Jonathan Perkin <email address hidden>
branch nick: mysql-6.
timestamp: Mon 2009-02-23 12:55:35 +0100
message:
Merge in changes from 6.0.9-release, with the additional change of installing the audit_null plugin
in RPMs.
---
revno: 2617.33.11
tags: mysql-6.0.9
revision-id: <email address hidden>
parent: <email address hidden>
committer: Jonathan Perkin <email address hidden>
branch nick: mysql-6.
timestamp: Sat 2009-01-10 13:01:39 +0100
message:
Add a bunch of missing files to the RPMs. Note that the audit_null plugin
is still missing, as it is currently installed in the wrong location and
there isn't time to change that for 6.0.9 release. This will be fixed
for the next release and added to the RPM.
This says that there is such path in the revision graph (the letters are the last letters of each revid):
3ei nr2(tag 6.0.9)
\ /
nxw
|
lh2
|
0ce
|
9jd
|
t73
|
zyv
|
93r(tag 6.0.10).
Note that all revisions from nr2 to 93r are non-merge revisions, except nxw. /bugs.launchpad .net/bzr/ +bug/475451). But the diff between nxw and the second parent (nr2) is huge. And that diff cannot be caused only by what is directly in 3ei (3ei has a small diff), it's caused by some 3ei's ancestors: the merge (nxw) didn't merge only 3ei, it merged lots of other revisions, which "bzr log -n0" does *not* print. To me it should print them, as they are part of what was incorporated over 6.0.9 to reach 6.0.10.
I can inspect the changes done by non-merge revisions (lh2 0ce 9jd t73 zyv 93r) easily ("bzr diff -c revid:etc"), and they are all very small diffs (thus they cannot explain the huge code diff between 6.0.9 and 6.0.10).
Now I inspect the only merge revision on the path: nxw. "bzr diff -c" is very small again, likely because the diff is implicitely done against the first parent (3ei) (see https:/