into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1

into mysql.com:/home/svoj/devel/mysql/yassl-mysql-5.0

Merge with latest yaSSL.

into mysql.com:/home/stewart/Documents/MySQL/5.0/bug11132

into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1

into mysql.com:/home/gluh/MySQL/Merge/5.0

  added ability to do SHOW CREATE DATABASE `information_schema`

This fixes the problem in 5.0 in the correct way.

The previous patch (for 4.1) is only valid for 4.1 and is done at the right time
for 4.1.

into mysql.com:/usr/home/ram/work/mysql-5.0

The 4.1 fix is not valid for 5.0. Remove it.

into mysql.com:/home/stewart/Documents/MySQL/5.0/bug11132

into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1

into mysql.com:/home/svoj/devel/mysql/yassl-mysql-5.0

into mysql.com:/home/svoj/devel/mysql/yassl-mysql-5.0

  Added test case for bug #11283.
field.h, field.cc:
  Fixed bug #11283: wrong conversion from varchar to decimal.
  Added methods Field_string::val_decimal,
  Field_varstring::val_decimal, Field_blob::val_decimal.
  They are not inherited from the base class Field_longstr
  anymore.

into deer.(none):/home/hf/work/mysql-5.0.10632

into deer.(none):/home/hf/work/mysql-5.0.10337

into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-5.0

into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0

into mysql.com:/space/my/mysql-5.0

into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0

  Added a teast case for bug #11284.
sql_select.cc:
  Fixed bug #11284.
  Optimization with empty inner table currently cannot be
  used in the case of nested outer join.

into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0

into rurik.mysql.com:/home/igor/dev/mysql-5.0-0

into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0

  Added a test case for bug #11285.
sql_select.cc:
  Fixed bug #11285.
  The problem occurred with Item_equal in an 'on expression'
  that was evaluated to false.

into mysql.com:/home/timka/mysql/src/5.0-dbg

into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0

  
When the GROUP BY clause contains a column reference that can be resolved to
both an aliased column in the SELECT list, and to a column in the FROM clause,
the group column is resolved to the column in the FROM clause (for ANSI conformance).
However, it may be so that the user's intent is just the other way around, and he/she
gets the query results grouped by a completely different column than expexted.
This patch adds a warning in such cases that tells the user that there is potential
ambiguity in the group column.

sql/sql_select.cc
- Added a warning when a GROUP column is ambiguous due to that there is a
  column reference with the same name both in the SELECT and FROM clauses.
  In this case we resolve to the column in FROM clause and warn the user
  of a possible ambiguity.
- More extensive comments.
- Changed the function to return bool instead of int (as in other places).

mysql-test/t/group_by.test
  Added test for BUG#11211.

mysql-test/r/group_by.result
  Added test for BUG#11211.

In 4.1 (it is different in 5.0), we do not use the mgm connection after fetching the
configuration (and if we did, we would have to have calls to check the connection and
reconnect if needed - in case the mgm server had restarted) so we can disconnect after
first use.

This means we won't have connections stuck in CLOSE_WAIT when the mgm server shuts down.