"the server side preparedStatement error for LIMIT placeholder",
which moves all uses of LIMIT clause from PREPARE to OPTIMIZE
and later steps.
After-review fixes.

into xiphis.org:/usr/home/antony/work2/p3-bug7241.6

into mysql.com:/home/dlenev/src/mysql-5.0-bg5860

into mysql.com:/home/svoj/devel/mysql/yassl-mysql-5.0

 #5860 "Multi-table UPDATE does not activate update triggers"
 #6812 "Triggers are not activated for INSERT ... SELECT"
 #8755 "Trigger is not activated by LOAD DATA".
This patch also implements proper handling of triggers for special forms
of insert like REPLACE or INSERT ... ON DUPLICATE KEY UPDATE. 
Also now we don't call after trigger in case when we have failed to
inserted/update or delete row. Trigger failure should stop statement
execution.

I have not properly tested handling of errors which happen inside of
triggers in this patch, since it is simplier to do this once we will be
able to access tables from triggers.

into xiphis.org:/usr/home/antony/work2/p3-bug7241.5

after recovery.

  Only acquire necessary write lock for multi-delete

into mysql.com:/home/gluh/MySQL/Merge/mysql-5.0

into mysql.com:/home/pem/work/mysql-5.0

into bk-internal.mysql.com:/data0/bk/mysql-5.0

  Memory leak in locally evalutated expressions during SP execution fixed by
  reusing allocated item slots when possible.
  Note: No test case added, since the test is a stress test that tries to make
  the machine to run out of memory.
  Second attempt, now tested with debug build, valgrind build, max (optimized)
  build, with and without --debug, --vagrind and --ps-protocol.
  Errors in trigger and view test with --debug in debug build where present
  before this patch, and likewise for valgrind warnings for view test in
  valgrind build with --ps-protocol.

fixups of test case and comment formatting

  Added BLACKHOLE and FEDERATED storage engines for max builds
  Some preparations for including yaSSL
ha_federated.cc:
  Use local seach path for "mysql_priv.h"

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

into mdk10.(none):/home/reggie/bk/mysql-5.0

This final cset is to fix a syntax problem in ha_myisammrg.cc where a / was left out of a format string.
It also adds a check in has_path to avoid a possible redundant comparison.

ha_myisammrg.cc:
  Replaced missing / in format string
my_getwd.c:
  Added test to see if FN_LIBCHAR != '/' before doing comparison to avoid redundant comparison

into mdk10.(none):/home/reggie/bk/mysql-4.1

This cset is to roll out the cset applied earlier from Ingo.
This bug has been fixed with a different cset.

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

This is a replacement for the original patch given by Ingo.  This one comes
from Monty.
The problem is that merge files now use unix style pathnames on all 
platforms.  The merge file open code was not properly converting those
pathnames back to non-unix when necessary.

They were both undocumented and not much useful. Removal has been agreed with Mark, Miguel and MikeZ.
Removing winmysqladmin from the source (it was not included anymore in no Windows package). I'll do a test Windows noinstall.zip build before push.
MikeZ just removed mysqlshutdown and mysqlwatch from the installer scripts.

  Check _LONGLONG_TYPE as well, to define 'word64', to make it
  work on Solaris 10 x86_64.
  Can't assume all x86_64 share the same assembler syntax.
  For now disabled assembler for x86_64 and Solaris.

  Use MY_STAT to declare argument to my_fstat()
des_key_file.cc:
  Use local seach path for "mysql_priv.h"
mysys.dsp, libmysqld.dsp, libmysql.dsp:
  New file needed, "../mysys/default_modify.c"