into  xiphis.org:/home/antony/work2/mysql-5.0-merge

into  zim.(none):/home/brian/mysql/dep-5.0

into  may.pils.ru:/home/svoj/devel/mysql/BUG18874/mysql-5.0

Fixed by moving update_key_parts() down to be after write_index().

Fix for bug#20648 We introduce a new field method for knowing "real size", and we now in archive null unused bits of a row to null before writing. 

into  may.pils.ru:/home/svoj/devel/mysql/BUG7391/mysql-5.0

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0

into  may.pils.ru:/home/svoj/devel/mysql/BUG20060/mysql-5.0

Problem described in this bug report affects MyISAM tables only.

Running mysqld --flush instructs mysqld to sync all changes to disk
after each SQL statement. It worked well for INSERT and DELETE
statements, but it did sync for UPDATE only in case if there was
index change (change of colum that has an index). If no updated column
has an index, data wasn't synced to disk.

This fix makes UPDATE statement to sync data to disk even if there is
no index change (that is only data change) and mysqld is run with
--flush option.

  After merge fix

into  sunlight.local:/local_work/leak_fix

into  sunlight.local:/local_work/leak_fix

  Correct memory leak fix

into  may.pils.ru:/home/svoj/devel/mysql/BUG14770/mysql-5.0-engines

  Memory leak fix

into  sunlight.local:/local_work/leak_fix

into  sunlight.local:/local_work/leak_fix

  Memory leak fix

now takes mbmaxlen into account when calculating max_length of new field. 

into  may.pils.ru:/home/svoj/devel/mysql/BUG7391/mysql-4.1

 - Backport patch from 5.0

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint

into  neptunus.(none):/home/msvensson/mysql/mysql-4.1

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0

into  may.pils.ru:/home/svoj/devel/mysql/BUG7391/mysql-4.1

           privileges

This problem is 4.1 specific. It doesn't affect 4.0 and was fixed
in 5.x before.

Having any mysql user who is allowed to issue multi table update
statement and any column/table grants, allows this user to update
any table on a server (mysql grant tables are not exception).

check_grant() accepts number of tables (in table list) to be checked
in 5-th param. While checking grants for multi table update, number
of tables must be 1. It must never be 0 (actually we have
DBUG_ASSERT(number > 0) in 5.x in grant_check() function).

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint