include/my_global.h:
  Auto merged
ndb/src/cw/cpcd/Process.cpp:
  Auto merged
ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
  Auto merged
strings/my_vsnprintf.c:
  Auto merged

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


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

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.



sql/ha_myisammrg.cc:
  removed the patch applied earlier
strings/my_vsnprintf.c:
  removed the patch applied earlier.  The patch was to add %c ability.  
  Monty has already done this.

include/my_global.h:
  icc does not define __ICC when emulating gcc. Use __INTEL_COMPILER to check for icc.
ndb/src/cw/cpcd/Process.cpp:
  Remove rlimit64
ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
  Remove dirent64

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.


myisammrg/myrg_open.c:
  use fn_format to convert pathnames if the files in the merge file have a pathname
mysys/my_getwd.c:
  add a test for '/' in the code that determines if a string inlucdes a pathname

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

VC++Files/mysys/mysys.dsp:
  Auto merged
include/my_sys.h:
  Auto merged
sql/sql_db.cc:
  Auto merged

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


sql/spatial.cc:
  Auto merged

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.


VC++Files/mysys/mysys.dsp:
  added my_access
VC++Files/mysys/mysys_ia64.dsp:
  added my_access.c
include/my_sys.h:
  if on windows, we use my_access.
  if not on windows, then my_access points to the native access method
mysys/Makefile.am:
  added my_access to mysys build file
mysys/mf_pack.c:
  changed call to access to my_access
sql/sql_db.cc:
  changed call to access to my_access

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.)


mysql-test/r/sp-error.result:
  New test case for BUG#10537.
mysql-test/t/sp-error.test:
  New test case for BUG#10537.
sql/sql_yacc.yy:
  Disable LOAD in stored procedures (just as for prepared statements).

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

Portability fixes


extra/yassl/include/buffer.hpp:
  Use assert.h instead of less portable cassert
extra/yassl/include/log.hpp:
  Use stdio.h instead of less portable cstdio
extra/yassl/include/socket_wrapper.hpp:
  Use assert.h instead of less portable cassert
extra/yassl/mySTL/helpers.hpp:
  Use stdlib.h instead of less portable cstdlib
extra/yassl/mySTL/stdexcept.hpp:
  Use string.h instead of less portable cstring
extra/yassl/mySTL/vector.hpp:
  Use assert.h instead of less portable cassert
extra/yassl/src/ssl.cpp:
  Use stdio.h instead of less portable cstdio
extra/yassl/taocrypt/include/block.hpp:
  Use stddef.h instead of less portable cstddef, always use ptrdiff_t instead of less portable std::ptrdiff_t
extra/yassl/taocrypt/include/file.hpp:
  Use stdio.h instead of less portable cstdio
extra/yassl/taocrypt/include/integer.hpp:
  Use string.h instead of less portable cstring
extra/yassl/taocrypt/include/runtime.hpp:
  Use stdlib.h instead of less portable cstdlib
extra/yassl/taocrypt/src/dh.cpp:
  Use math.h instead of less portable cmatch

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

myisam/sp_key.c:
  a fix (bug #10757: gis-rtree.test fails)
  float8get() doesn't properly work with local variables sometimes.

mysql-test/t/subselect.test:
  Add test of result

include/my_global.h:
  make it compilable on mac os
ndb/src/kernel/SimBlockList.cpp:
  make it compilable with gcc 4.0

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


sql/sql_select.cc:
  Auto merged

Fixed errors reported by valgrind (some errors in NDB remains)


myisam/rt_split.c:
  Added missing cast that caused problem on novell
  (minor code cleanup)
ndb/src/ndbapi/Ndb.cpp:
  Moved DBUG_ENTER to remove warning from DBUG library
sql/field_conv.cc:
  Added test for valgrind/purify to avoid warning
sql/item_sum.cc:
  Removed comment and added ASSERT as setup can't be called twice anymore
sql/sql_delete.cc:
  Fixed wrong return value
sql/sql_parse.cc:
  More debugging
sql/sql_select.cc:
  Removed duplicate call to setup() which caused a memory leak
strings/my_vsnprintf.c:
  Added support for '%c' (used when printing my_getopt errors)

mysql-test/r/subselect.result:
  changes in plans
  test for bug#6384
mysql-test/t/subselect.test:
  test for bug#6384
sql/sql_select.cc:
  do not set equal field from outer query

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

  "REFERENCED_TABLE_NAME", "REFERENCED_COLUMN_NAME" fields into
  KEY_COLUMN_USAGE table

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

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

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

configure.in:
  Bump version number

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

Cset exclude: msvensson@neptunus.(none)|ChangeSet|20050425090838|60886


configure.in:
  Exclude
sql/opt_range.cc:
  Exclude

mysys/mf_iocache.c:
  Reset seek_not_done after doing a seek.

This patch was submitted by Ingo and it appears to work correctly.


sql/ha_myisammrg.cc:
  use FN_LIBCHAR instead of / so buff works correctly on Windows
strings/my_vsnprintf.c:
  add support for %c to my_vsnprintf

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


sql/spatial.cc:
  Auto merged
sql/sql_udf.cc:
  Auto merged

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

compilation fixes


extra/yassl/src/cert_wrapper.cpp:
  yaSSL compilation fix on nocona
extra/yassl/taocrypt/include/error.hpp:
  yaSSL compilation fix
extra/yassl/taocrypt/include/misc.hpp:
  yaSSL compilation fix on many platforms
tools/Makefile.am:
  mysqltestmanager with yaSSL enabled compilation fix on FreeBSD 5.3

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


sql/item_func.cc:
  Auto merged

sql_udf.cc:
  changed dl_name to udf->dl in mysql_create_function


sql/sql_udf.cc:
  changed dl_name to udf->dl in mysql_create_function