into  trift2.:/MySQL/M51/clone-5.1

 - make sure to reset the read and write sets


handler.cc, log_event.cc:
  - make sure to reset the read and write sets


sql/handler.cc:
  - make sure to reset the read and write sets
sql/log_event.cc:
  - make sure to reset the read and write sets

   - The errno variable should only be used when the previous socket
     write failed, it should be regarded as undefined at other times

OutputStream.cpp:
  Only use "errno" after the attempt to write to the socket has failed


storage/ndb/src/common/util/OutputStream.cpp:
  Only use "errno" after the attempt to write to the socket has failed

into  mysql.com:/data0/mysqldev/my/build-200801151318-5.1.23-rc/mysql-5.1-release


extra/yassl/src/handshake.cpp:
  Auto merged

into  janus.mylan:/data0/mysqldev/users/serg/mysql-5.1-release


extra/yassl/src/template_instnt.cpp:
  Auto merged
extra/yassl/src/yassl_imp.cpp:
  Auto merged

extra/yassl/src/template_instnt.cpp:
  new template instantiation

into  kaamos.(none):/data/src/opt/mysql-5.1-opt


client/mysql.cc:
  Auto merged

into  kaamos.(none):/data/src/opt/mysql-5.1-opt


client/mysql.cc:
  Auto merged
client/mysqltest.c:
  Auto merged
sql/log.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged

into  kaamos.(none):/data/src/opt/mysql-5.0-opt


client/mysql.cc:
  Auto merged

into  bk-internal.mysql.com:/data0/bk/mysql-5.1-opt


sql/filesort.cc:
  Auto merged

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

  Bug#33675: Usage of an uninitialized memory by filesort in a subquery caused
  server crash.
  Free smaller buffer before allocating bigger one.


sql/filesort.cc:
  Bug#33675: Usage of an uninitialized memory by filesort in a subquery caused
  server crash.
  Free smaller buffer before allocating bigger one.

into  kaamos.(none):/data/src/opt/mysql-5.1-opt


sql/field.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
mysql-test/r/subselect.result:
  Manual merge.
mysql-test/t/subselect.test:
  Manual merge.
sql/filesort.cc:
  Manual merge.

into  kaamos.(none):/data/src/opt/mysql-5.0-opt


sql/set_var.cc:
  Auto merged

into  kaamos.(none):/data/src/opt/mysql-5.1-opt


mysql-test/r/union.result:
  Auto merged
mysql-test/t/union.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/sql_select.cc:
  Auto merged

into  kaamos.(none):/data/src/opt/mysql-5.0-opt

into  kaamos.(none):/data/src/opt/bug33305/my51-bug33305


mysql-test/r/cast.result:
  Auto merged
mysql-test/r/type_date.result:
  Auto merged
mysql-test/r/union.result:
  Auto merged
mysql-test/t/cast.test:
  Auto merged
mysql-test/t/skip_grants.test:
  Auto merged
mysql-test/t/type_date.test:
  Auto merged
mysql-test/t/union.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
mysql-test/r/skip_grants.result:
  Manual merge.

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

into  macbook.gmz:/Users/kgeorge/mysql/work/B33133-5.1-opt


mysql-test/r/func_group.result:
  Auto merged
mysql-test/t/func_group.test:
  Auto merged
sql/sql_base.cc:
  Auto merged

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


sql/sql_base.cc:
  Auto merged

When resolving references we need to take into consideration
the view "fields" and allow qualified access to them.
Fixed by extending the reference resolution to process view
fields correctly.


mysql-test/r/func_group.result:
  Bug #33133: test case
mysql-test/t/func_group.test:
  Bug #33133: test case
sql/sql_base.cc:
  Bug #33133: allow qualified alias refs to view fields

server crash.

The filesort implementation has an optimization for subquery execution which
consists of reusing previously allocated buffers. In particular the call to
the read_buffpek_from_file function might be skipped when a big enough buffer
for buffer descriptors (buffpeks) is already allocated. Beside allocating
memory for buffpeks this function fills allocated buffer with data read from
disk. Skipping it might led to using an arbitrary memory as fields' data and
finally to a crash.

Now the read_buffpek_from_file function is always called. It allocates
new buffer only when necessary, but always fill it with correct data.


sql/filesort.cc:
  Bug#33675: Usage of an uninitialized memory by filesort in a subquery caused
  server crash.Now the read_buffpek_from_file function is always called. It allocates
  new buffer only when necessary, but always fill it with correct data.
mysql-test/r/subselect.result:
  Added a test case for the bug#33675: Usage of an uninitialized memory by
  filesort in a subquery caused server crash.
mysql-test/t/subselect.test:
  Added a test case for the bug#33675: Usage of an uninitialized memory by
  filesort in a subquery caused server crash.

into  macbook.gmz:/Users/kgeorge/mysql/work/B33256-5.1-opt


mysql-test/r/union.result:
  Auto merged
sql/field.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
mysql-test/r/type_decimal.result:
  merge of bug 33256 5.0-opt -> 5.1-opt
mysql-test/t/union.test:
  merge of bug 33256 5.0-opt -> 5.1-opt
sql/field.h:
  merge of bug 33256 5.0-opt -> 5.1-opt
sql/item.cc:
  merge of bug 33256 5.0-opt -> 5.1-opt
sql/item_sum.cc:
  merge of bug 33256 5.0-opt -> 5.1-opt
sql/item_timefunc.cc:
  merge of bug 33256 5.0-opt -> 5.1-opt
sql/item_timefunc.h:
  merge of bug 33256 5.0-opt -> 5.1-opt

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


sql/field.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/item_timefunc.h:
  Auto merged

    After-merge fix for bug#33536: The target to copy to is now called "$DEST".


scripts/make_binary_distribution.sh:
  After-merge fix for bug#33536: The target to copy to is now called "$DEST".

into  trift2.:/MySQL/M51/bug33536-5.1


scripts/make_binary_distribution.sh:
  Manual merge of the fix for bug#33536 from 5.0 to 5.1,
  the restructuring of this script makes automerge fail.

into  trift2.:/MySQL/M50/bug33536-5.0


scripts/make_binary_distribution.sh:
  Auto merged

Fix the code to get the "libgcc" file name so that the failure of Intel's ICC
to provide this information does not cause any problems.

This fixes  bug#33536  Option "--print-libgcc-file" does not work with ICC compiler


scripts/make_binary_distribution.sh:
  The (old) code to get the "libgcc" file name does not really work when using Intel's ICC.
  ICC accepts the "--print-libgcc-file" option but ignores it, does not produce any output.
  
  However, ICC tricks automake into taking it for a GCC ("GXX" variable is set, see
  http://www.gnu.org/software/autoconf/manual/html_node/C_002b_002b-Compiler.html#C_002b_002b-Compiler
  and its discussion of the "AC_PROG_CXX" macro).
  
  There are two possible approaches:
  a) Check "$CC" or "$CXX" to tell ICC from GCC, and do not ask ICC for the "libgcc" file name.
  b) Just ask it, but protect that code so that its failure does not cause any damage.
  
  This patch takes the second route:
  1) Put the call "@CC@ ... --print-libgcc-file" into a pipeline, followed by "|| true",
     so that (for the shell semantics) the command cannot fail.
     (ICC will exit non-zero because it is not given a source file.)
  2) Explicitly redirect any error messages.
  3) Do not use the compiler's return code but rather the (non)empty variable to check success.
  4) Ensure that the contents really is a file before taking it as a file name.
  
  Item 1) is especially important when the tool gets a "set -e" (this happens in 5.1, currently)
  which would make the failing compiler call a fatal thing.
  
  This fixes  bug#33536  Option "--print-libgcc-file" does not work with ICC compiler

                    to be compiled in

The problem was that on a statically built server an attempt to create
a UDF resulted in a different, but reasonable error ("Can't open shared
library" instead of "UDFs are unavailable with the --skip-grant-tables
option"), which caused a failure for the test case for bug #32020.

Fixed by moving the test case for bug #32020 from skip_grants.test to a
separate test to ensure that it is only run when the server is built
with support for dynamically loaded libraries.


mysql-test/r/skip_grants.result:
  Moved the test case for bug #32020 to a separate test.
mysql-test/t/skip_grants.test:
  Moved the test case for bug #32020 to a separate test.
mysql-test/r/udf_skip_grants.result:
  Moved the test case for bug #32020 to a separate test.
mysql-test/t/udf_skip_grants-master.opt:
  Moved the test case for bug #32020 to a separate test.
mysql-test/t/udf_skip_grants.test:
  Moved the test case for bug #32020 to a separate test.

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


sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
mysql-test/r/union.result:
  Bug#32848: Manual merge
mysql-test/t/union.test:
  Bug#32848: Manual merge

into  trift2.:/MySQL/M51/push-5.1


netware/mysql_test_run.c:
  Auto merged
sql/sp_head.cc:
  Auto merged

into  trift2.:/MySQL/M51/push-5.1

into  trift2.:/MySQL/M50/merge-5.0

 w/ Field_date instead of Field_newdate
  
Field_date was still used in temp table creation.
Fixed by using Field_newdate consistently throughout the server
except when reading tables defined with older MySQL version.
No test suite is possible because both Field_date and Field_newdate
return the same values in all the metadata calls. 


mysql-test/r/type_decimal.result:
  Bug #33256: removed redundant warnings
sql/field.h:
  Bug #33256: Add a constructor similar to Field_date::Field_date()
sql/item.cc:
  Bug #33256: Use Field_newdate instead of Field_date 
  for all temp tables and CREATE .. SELECT
sql/item_sum.cc:
  Bug #33256: Use Field_newdate instead of Field_date 
  for all temp tables and CREATE .. SELECT
sql/item_timefunc.cc:
  Bug #33256: Use Field_newdate instead of Field_date 
  for all temp tables and CREATE .. SELECT
sql/item_timefunc.h:
  Bug #33256: Use Field_newdate instead of Field_date 
  for all temp tables and CREATE .. SELECT

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build


client/mysql.cc:
  Auto merged

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build

client/mysql.cc:
  BUG#33057, avoid calling strlen() *for every single character* in the client's input