[PATCH] trivial patch with 4 j9* related master-canon updates

[Myrna van Lunteren <m....@gmail.com>]

Attaching 2 patches with 4 master updates:
DERBY-836_j9catchup_20060831.diff
catching up on DERBY-836 changes:
- master/j9_foundation/resultset.out
- master/j9_foundation/floattypes.out
- master/j9_13/floattypes.out (note: this .out is concocted - it's
closer to how the wsdd5.6/j9_13 run should be if it weren't for
DERBY-804. So, this output is correct output, but not current. I don't
think it matters as the test is currently skipping, but I thought it
would prevent confusion later on to update it.)

DERBY-1554_j9catchup_20060831.diff
master/j9_foundation/autoGeneratedJdbc30.out - reflecting a similar
change as was made to master/autoGeneratedJdbc30.out.

If a friendly committer can please commit these? The same stuff is
needed with the trunk & 10.2. (These patches were created against a
trunk).

I was wondering whether to attach these patches to their respective
closed bugs. I prefer not to make a new bug just for these issues.
Opinions?

Thx
Myrna

Re: [PATCH] trivial patch with 4 j9* related master-canon updates

[Andrew McIntyre <mc...@gmail.com>]

On 8/31/06, Myrna van Lunteren <m....@gmail.com> wrote:
> Attaching 2 patches with 4 master updates:
>
> <snip/>
>
> I was wondering whether to attach these patches to their respective
> closed bugs. I prefer not to make a new bug just for these issues.
> Opinions?

Submitting fixes for trivial issues this way is fine by me. I've
committed these masters, along with your recent patches for DERBY-804
and DERBY-1702 to the trunk.

In order to not make more work for Rick, I have not applied these to
the 10.2 branch. Hopefully he will pick these up during the next merge
for the new 10.2 beta candidate tomorrow. Otherwise, I will look into
merging them myself.

andrew