Renamed variable, to avoid name clash with macro "rem_size"
  on AIX 5.3 and "/usr/include/sys/xmem.h" (bug#17648)
asn.cpp, asn.hpp:
  Avoid name clash with NAME_MAX

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

- Adapt it to work with the handlerton class

into  salvation.intern.azundris.com:/home/tnurnberg/mysql-5.0

into  salvation.intern.azundris.com:/home/tnurnberg/work/mysql-5.0-merge

REPLACE ... SELECT would require INSERT privileges on certain tables
when SELECT really suffices. Require INSERT only on target table.

Post merge changes.

into  govinda.patg.net:/home/patg/mysql-build/mysql-5.0-bug18764.2

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  rama.(none):/home/jimw/my/mysql-5.0-17608

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

into  production.mysql.com:/usersnfs/abotchkov/mysql-5.0.mrg

into  mysql.com:/home/hf/work/mysql-5.0.mrg

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

Removed logic in ha_federated::write_row, which checks field query ids in the
loop which builds the query to run on the remote server.

into  rurik.mysql.com:/home/igor/mysql-5.0-opt

into  olga.mysql.com:/home/igor/mysql-5.0-opt

  Test case for bug#10977 altered to make it work in both plain and ps-protocol modes.

  Corrected the test case after fixing bug#10977

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

 - Fix for "bug#16755 Please find a SSL library that is FLOSS-Exception / LGPL copyrighted"

into  rurik.mysql.com:/home/igor/mysql-5.0-opt

  Fixed bug#10977: No warning issued if a column name is truncated
  New warning message is added.

When an alias is set to a column leading spaces are removed from the alias.
But when this is done on aliases set by user this can lead to confusion.

Now Item::set_name() method issues the warning if leading spaces were removed
from an alias set by user.

New warning message is added.

into  orca.ndb.mysql.com:/space_old/pekka/ndb/version/my50

The bug caused a crash of the server if a subquery with
ORDER BY DESC used the range access method.
The bug happened because the method QUICK_SELECT_DESC::reset
was not reworked after MRR interface had been introduced.

The bug was due to a loss happened during a refactoring made
on May 30 2005 that modified the function JOIN::reinit.
As a result of it for any subquery the value of offset_limit_cnt
was not restored for the following executions. Yet the first 
execution of the subquery made it equal to 0.
The fix restores this value in the function JOIN::reinit.  

into  rurik.mysql.com:/home/igor/mysql-5.0-opt

into  anubis.greendragongames.com:/home/greenman/workspace-mysql/mysql/merge-4.1_2_5.0

into  mysql.com:/usr/home/ram/work/4.1.b15195

to avoid the potential security problem.
(see bug #15195: Security Breach with MERGE table)