and "README" (header part: "This is a release of MySQL ...")
from "trunk" to "next-mr".

by adding the header part "This is MySQL ...".

the license remains to be the GPL Version 2, June 1991

This is *no* change in contents, the differences are formatting only
and an address update of the FSF. It continues to be Version 2, June 1991.

Conflicts:
  - support-files/mysql.spec.sh
  - configure.in

Now that Oracle has legally acquired Sun, change the copyright owner
and the vendor.

Conflicts:
  - sql/item.cc

Conflicts:
  - scripts/mysqld_multi.sh
  - sql/item_timefunc.cc

Conflicts:
  - sql/share/Makefile.am

as provided by Trudy Pelzer.

to mysql-trunk-merge.

Conflicts:

Text conflict in scripts/Makefile.am
Text conflict in sql/share/Makefile.am

Fixed a syntax error in mysqld_multi.sh

The problem is that cond->fix_fields(thd, 0) breaks
condition(cuts off 'having'). The reason of that is
that NULL valued Item pointer is present in the
middle of Item list and it breaks the Item processing
loop.

performance degradation.

Filesort + join cache combination is preferred to full index scan because it
is usually faster. But it's not the case when the index is clustered one.

Now test_if_skip_sort_order function prefers filesort only if index isn't
clustered.