into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge

into  perch.ndb.mysql.com:/home/jonas/src/50-ndb


ndb/src/common/transporter/TCP_Transporter.cpp:
  Auto merged

  make sure whole send buffer is flushed, even when wrapping around end


ndb/src/common/transporter/TCP_Transporter.cpp:
  ndb - bug#34005
    make sure whole send buffer is flush, even when wrapping around end

into  perch.ndb.mysql.com:/home/jonas/src/50-ndb


ndb/src/common/util/Bitmask.cpp:
  merge
ndb/test/ndbapi/testBitfield.cpp:
  merge

    make sure that getField does not write after supplied buffer
    (recommit to correct clone, for easy merging)


ndb/include/util/Bitmask.hpp:
  ndb- bug#33750
        make sure that getField does not write after supplied buffer
ndb/src/common/util/Bitmask.cpp:
  ndb- bug#33750
        make sure that getField does not write after supplied buffer
ndb/test/ndbapi/testBitfield.cpp:
  move test from Bitmask.cpp into testBitfield
        for automatic testing

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


client/mysql.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.0-opt


sql/set_var.cc:
  Auto merged

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

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

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  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

                    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  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.0-build

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

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

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


sql/sql_select.cc:
  Auto merged

Warnings elimination


sql/sql_select.cc:
  Bug#32848: Warnings elimination

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


mysql-test/r/cast.result:
  Auto merged
mysql-test/r/type_date.result:
  Auto merged
mysql-test/t/cast.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/item_timefunc.h:
  Auto merged
mysql-test/t/type_date.test:
  manual merge

into  linux-st28.site:/home/martin/mysql/src/bug32848/my50-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  magare.gmz:/home/kgeorge/mysql/autopush/B19390-5.0-opt

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge

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

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.


mysql-test/r/rpl_trigger.result:
  Bug #19390: corrected the test to check for its procedure only
mysql-test/t/rpl_trigger.test:
  Bug #19390: corrected the test to check for its procedure only

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

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


client/mysqltest.c:
  Auto merged

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

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

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


client/mysqltest.c:
  Auto merged

fix test program


client/mysqltest.c:
  fix buffer off-by-ones in test program

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

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


client/mysql.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/unireg.cc:
  Auto merged

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


sql/set_var.cc:
  Auto merged

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


mysys/mf_pack.c:
  Auto merged
sql/log.cc:
  Auto merged
sql/sql_show.cc:
  manual merge
sql/unireg.cc:
  manual merge

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


sql/item_timefunc.cc:
  Auto merged