← Back to team overview

maria-developers team mailing list archive

5.5 merge: sql_select.cc



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

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

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

2. http://tinyurl.com/69lwrp9 - a big chunk is moved around in

that's all, the rest of the file I've merged already.


Follow ups