into  mysql.com:/home/svoj/devel/mysql/BUG28884/mysql-5.1-engines

into  stella.local:/home2/mydev/mysql-5.1-axmrg

  "Update of CSV row incorrect for some BLOBs"
  when reading in rows, move blob columns into temporary storage not
  allocated by Field_blob class or else row update operation will
  alter original row and make mysql think that nothing has been changed.
fix incrementing wrong statistic values.

            at page 1024 with ucs2_bin
Post merge fix

into  stella.local:/home2/mydev/mysql-5.1-axmrg

into  stella.local:/home2/mydev/mysql-5.0-axmrg

            at page 1024 with ucs2_bin
Post-pushbuild fix.
Moved test from myisam.test to ctype_ucs2_def.test.
UCS2 is not always available.

Fixed that return value of malloc was not checked.
Fixed wrong argument count (compilation failure) to base64_decode()
function.

Note:
- there is no test case for this fix as this code is never compiled
  into mysql clients/server;
- as this code is used for internal testing purposes only, no changelog
  entry needed.

into  stella.local:/home2/mydev/mysql-5.1-axmrg

into  stella.local:/home2/mydev/mysql-5.1-axmrg

into  stella.local:/home2/mydev/mysql-5.1-axmrg

into  stella.local:/home2/mydev/mysql-5.0-axmrg

           and a char-field > 128 exists

CHECK TABLE (non-QUICK) and any form of repair table did wrongly rate
records as corrupted under the following conditions:
1. The table has dynamic row format and
2. it has a CHAR like column > 127 bytes (but not VARCHAR)
   (for multi-byte character sets this could be less than 127
   characters) and
3. it has records with > 127 bytes significant length in that column
   (a byte beyond byte position 127 must be non-space).
Affected were the statements CHECK TABLE, REPAIR TABLE, OPTIMIZE TABLE,
ALTER TABLE. CHECK TABLE reported and marked the table as crashed if any
record was present that fulfilled condition 3. The other statements
deleted these records.

The problem was a signed/unsigned compare in MyISAM code. A
char to uchar change became necessary after the big byte to uchar
change.

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

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

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

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

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.

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

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

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

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

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

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

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

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

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.

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.

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

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

                    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.

into  stella.local:/home2/mydev/mysql-5.1-axmrg

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

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

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