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"

  The natural InnoDB type for NEWDECIMAL is FIXBINARY, not BINARY, since there probably is no benefit from stripping trailing bytes 0x20; note that tables created with 5.0.6 and containing DECIMAL do not need to be rebuilt, as BINARY works as well; note that because of Jani's fix to bug 10465, tables created with 5.0.? - 5.0.5 DO NEED TO BE REBUILT if they contain DECIMAL

  Added test cases for bug #9938.
item.h:
  Fixed bug #9938: missing method not_null_tables for Item_ref.

  Added missing comment for fix of #10561.

  Post review corrections for optimization request #10561.

  Added test cases for optimization request #10561.
opt_range.cc, sql_select.cc:
  Fixed bug #10561: an optimization request to allow
  range analysis for NOT IN and NOT BETWEEN.

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

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

The problem was that on Windows the access method indicates that access to file 
such as "com1" and "lpt1" is allowed (since they are device names) and
this causes mysql to attempt to open them as databases or tables.

The fix was to write our own my_access method that uses other Win32 functions
to determine if the given argument is indeed a file and has to requested
mode.

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

                  procedure.
  by simply disabling 'load' in stored procedures, like it's already disabled
  for prepared statements. (They must be made "re-execution" safe before
  working with either PS or SP.)

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

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

into mysql.com:/mnt/archive/svoj/mysql/mysql-5.0

Portability fixes

into sanja.is.com.ua:/home/bell/mysql/bk/work-bug-5.0

into mysql.com:/home/my/mysql-5.0

into gluh.mysql.r18.ru:/home/gluh/release/mysql-5.0

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

into mysql.com:/usr/home/ram/work/mysql-5.0-build