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

  manual merge

into  mysql.com:/home/tnurnberg/work/mysql-5.0-maint-20214

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

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

into  rama.(none):/home/jimw/my/mysql-5.0-clean

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

   - Thanks to cerber for the patch!

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

"A SELECT privilege on a view is required for SHOW CREATE VIEW and it will stay
that way because of compatibility reasons." (see #20136)

a test case to illustrate how the ACLs work in this case (and ensure they will continue
to do so in the future)

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

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

into  rama.(none):/home/jimw/my/mysql-5.0-16502

into  rama.(none):/home/jimw/my/mysql-5.0-16502

into  rama.(none):/home/jimw/my/mysql-5.0-16502

into  bodhi.local:/opt/local/work/mysql-5.0-runtime-merge

into  moonbone.local:/work/tmp_merge-5.0-opt-mysql

into  moonbone.local:/work/tmp_merge-5.0-opt-mysql

into  moonbone.local:/work/tmp_merge-5.0-opt-mysql

into  moonbone.local:/work/tmp_merge-5.0-opt-mysql

into  moonbone.local:/work/tmp_merge-4.1-opt-mysql

into  moonbone.local:/work/tmp_merge-4.1-opt-mysql

into  mysql.com:/home/hf/work/mysql-4.1.20317

into  bodhi.local:/opt/local/work/mysql-5.0-runtime-merge

into  lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-5.0