← Back to team overview

maria-developers team mailing list archive

5.5 merge: sql_select.cc



>>>>> "Sergei" == Sergei Golubchik <serg@xxxxxxxxxxxx> writes:

Sergei> Hi.
Sergei> Here I'll list changesets that cause conflicts and ask what to do.

Sergei> 1. http://tinyurl.com/63tey39 vs. http://tinyurl.com/5v2pluf

Sergei> it's a fix for bug#49322. both changes are similar, return is moved
Sergei> down. But Igor put it after the while() loop, while Ole John - in the
Sergei> loop, as soon a non-match is found. What difference does it make, I mean
Sergei> the earlier return, what consequences?

Sergei> 2. http://tinyurl.com/69lwrp9 - a big chunk is moved around in
Sergei> test_if_skip_sort_order()

Yes, it was done as part of merging 5.1 with 5.3.

The original test_if_skip_sort_order() had also several limitations,
in that it was depending on the order of the keys which key it would
use. I made all keys equal.

I assume you should be able to take my version as it is (this should
be ok if 5.5 changes comes from the changes they did in 5.1)