into  mysql.com:/home/hf/work/29801/my51-29801

               if remote server sends malicious response.

We need to check if the SHOW TABLE STATUS query we issue inside the
FEDERATED engine returned the result with the proper (or just sufficient)
number of rows. Otherwise statements like row[12] can crash the server.

  Post-merge fix.

into  gleb.loc:/home/uchum/work/bk/5.1-opt

  Bug #31077: post-commit fix.

  Bug #31077: post-commit fix.

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

mysqldump adds the "-- Dump completed on YYYY-MM-DD hh:mm:ss" string
to the end of output if the --comments switch is on.
The only way to suppress this line is to use --skip-comments/--compact
switch.

New switch has been added to the mysqldump client command line:
--dump-date.

For the compatibility with previous releases, by default the --dump-date
is on.
The --dump-date switch forces mysqldump to add date to the
"-- Dump completed on ..." string at the end of output.
The --skip-dump-date switch supresses the output of date string
and uses short form of that commentary: "-- Dump completed".
--skip-comments or --compact switches disable the whole commentary
as usual.

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

  Corrected test case for the bug#29908.

into  moonbone.local:/work/27990-bug-5.0-opt-mysql

The change_to_use_tmp_fields function leaves the orig_table member of an
expression's tmp table field filled for the new Item_field being created.
Later orig_table is used by the Field::make_field function to provide some
info about original table and field name to a user. This is ok for a field
but for an expression it should be empty.

The change_to_use_tmp_fields function now resets orig_table member of
an expression's tmp table field to prevent providing a wrong info to a user.
The Field::make_field function now resets the table_name and the org_col_name
variables when the orig_table is set to 0.

The NAME_CONST function is required to work correctly with constants only.
When executed with functions that return types other than those returned by
Item::field_type (string, int, decimal, or real), the result gets cast to
one of those types. This cannot happen for constants.
Fixed by only allowing constants as arguments to NAME_CONST.

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

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

When calculating the result length of an integer DIV function 
the number of decimals was used without checking the result type
first. Thus an uninitialized number of decimals was used for some 
types. This caused an excessive amount of memory to be allocated 
for the field's buffer and crashed the server.

 
Fixed by using the number of decimals only for data types that 
can have decimals and thus have valid decimals number.

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

skip the check of directory presence for 'information_schema' name

view_body_utf8 attribute type is changed to 'escaped string'

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

The optimizer takes different execution paths during EXPLAIN than SELECT,
this fix relates only to EXPLAIN, hence no behavior changes.
The test of sort keys for ORDER BY was prohibited from considering keys
that were mentioned in IGNORE KEYS FOR ORDER BY. This led to two 
inconsistencies: One was that IGNORE INDEX FOR GROUP BY and 
IGNORE INDEX FOR ORDER BY gave apparently different EXPLAINs; the latter 
erroneously claimed to do filesort. The second inconsistency 
is that the test of sort keys is called twice, finding a sort key the first
time but not the second time, leading to the mentioned filesort.

Fixed by making the test of sort keys consider all enabled 
keys on the table. This test rejects keys that are not covering, and for 
covering keys the hint should be ignored anyway. 

into  sunlight.local:/local_work/29908-bug-5.0-opt-mysql

into  magare.gmz:/home/kgeorge/mysql/autopush/B30468-5.1-opt

into  magare.gmz:/home/kgeorge/mysql/autopush/B30468-5.1-opt

into  magare.gmz:/home/kgeorge/mysql/autopush/B30468-5.1-opt

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

When expanding a * in a USING/NATURAL join the check for table access
for both tables in the join was done using the grant information of the
first one.
Fixed by getting the grant information for the current table while 
iterating through the columns of the join.

  Post-commit fix.

into  gleb.loc:/home/uchum/work/bk/5.1-opt

into  gleb.loc:/home/uchum/work/bk/5.1-opt