into  mysql.com:/misc/mysql/31990/51-31990

post-merge fixes

into  mysql.com:/misc/mysql/31990/51-31990

into  magare.gmz:/home/kgeorge/mysql/work/B19390-5.1-opt

into  magare.gmz:/home/kgeorge/mysql/autopush/B19390-5.0-opt

The checks in the test for bug #12480 were too wide and
made the test to depend on the procedures and triggers
present in the server.
Corrected the test to check only for the procedure and 
trigger it creates.

into  sin.intern.azundris.com:/misc/mysql/32770/51-32770

into  mysql.com:/misc/mysql/32770/50-32770

into  mysql.com:/misc/mysql/31752_/50-31752_

into  mysql.com:/misc/mysql/31752_/51-31752_

into  mysql.com:/misc/mysql/31752_/50-31752_

fix test program

build fixes

into  mysql.com:/misc/mysql/32770/50-32770

into  mysql.com:/misc/mysql/31752_/51-31752_

into  mysql.com:/misc/mysql/31752_/50-31752_

into  mysql.com:/misc/mysql/31752_/51-31752_

into  mysql.com:/misc/mysql/31752_/50-31752_

into  mysql.com:/misc/mysql/32770/51-32770

into  mysql.com:/misc/mysql/32770/50-32770

into  mysql.com:/misc/mysql/32770/51-32770

into  mysql.com:/misc/mysql/32350/51-32350

into  mysql.com:/misc/mysql/32350/51-32350

into  mysql.com:/misc/mysql/32350/50-32350

show version of mysqldump, release of server et al., and version of
current server in mysqldumps.

into  linux-st28.site:/home/martin/mysql/src/bug32798-united/my50-bug32798-united-push

into  linux-st28.site:/home/martin/mysql/src/bug32858/my50-bug32858-push

into  linux-st28.site:/home/martin/mysql/src/bug32798-united/my50-bug32798-united-push

into  linux-st28.site:/home/martin/mysql/src/bug32798-united/my51-bug32798-united-push

into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug27848

In a union without braces, the order by at the end is applied to the 
overall union. It therefore should not interfere with the individual
select parts of the union.

Fixed by changing our parser rules appropriately.

a column with null values

Post-merge fix

into  linux-st28.site:/home/martin/mysql/src/bug32798-united/my51-bug32798-united

with null values

For queries containing GROUP_CONCAT(DISTINCT fields ORDER BY fields), there 
was a limitation that the DISTINCT fields had to be the same as ORDER BY 
fields, owing to the fact that one single sorted tree was used for keeping 
track of tuples, ordering and uniqueness. Fixed by introducing a second 
structure to handle uniqueness so that the original structure has only to 
order the result.

into  dl145s.mysql.com:/data0/mhansson/my51-bug32858

into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt

into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt