include/my_global.h:
  Look for __INTEL_COMPILER to detect icc

ndb/src/cw/cpcd/Process.cpp:
  Remove ifdef for icc
  Shouldn't need to define rlimit64

ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  fix access to freed memory

  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.


extra/yassl/taocrypt/include/misc.hpp:
  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"


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

extra/yassl/include/yassl_types.hpp:
  A fix for Sun Forte 7
extra/yassl/mySTL/helpers.hpp:
  Better comment for the previous fix.
extra/yassl/mySTL/list.hpp:
  A fix for Sun Forte 7

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


extra/yassl/mySTL/helpers.hpp:
  Auto merged

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

extra/yassl/include/openssl/ssl.h:
  Fix -std=c++98 mode compilation failures.
extra/yassl/include/yassl_error.hpp:
  Fix -std=c++98 mode compilation failures.
extra/yassl/include/yassl_types.hpp:
  Fix -std=c++98 mode compilation failures.
extra/yassl/mySTL/helpers.hpp:
  Fix AIX 5.2 compilation problem.
extra/yassl/taocrypt/include/asn.hpp:
  Fix -std=c++98 mode compilation failures.
vio/Makefile.am:
  Add a dummy C++ file to SSL tests to make libtool use a C++ linker:
  this lets ssl tests link when using yaSSL and a non-gcc C++ compiler.

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 mysql.com:/usr/home/ram/work/mysql-5.0-build

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

  Fixes for valgrind errors and compatiblity issues by Monty


myisam/rt_split.c:
  Fixes for valgrind errors and compatiblity issues by Monty
sql/field_conv.cc:
  Fixes for valgrind errors and compatiblity issues by Monty
sql/sql_delete.cc:
  Fixes for valgrind errors and compatiblity issues by Monty
sql/sql_select.cc:
  Fixes for valgrind errors and compatiblity issues by Monty
strings/my_vsnprintf.c:
  Fixes for valgrind errors and compatiblity issues by Monty

  "REFERENCED_TABLE_NAME", "REFERENCED_COLUMN_NAME" fields into
  KEY_COLUMN_USAGE table

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

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.

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

we need proper rounding there


mysql-test/r/func_math.result:
  test result fixed
mysql-test/t/func_math.test:
  test case added
sql/item_func.cc:
  my_double_round implementation added
sql/item_strfunc.cc:
  my_double_round used
sql/mysql_priv.h:
  my_double_round interface

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


mysql-test/r/type_newdecimal.result:
  Auto merged
mysql-test/t/type_newdecimal.test:
  Auto merged
sql/item_func.cc:
  Auto merged

 - after review fixes


mysql-test/r/ndb_basic.result:
  Test using table with long name
mysql-test/t/ndb_basic.test:
  Test using table with long name
ndb/include/transporter/TransporterDefinitions.hpp:
  Define constant for max section size
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Add check for not sending too long table name to ndb kernel

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


sql/spatial.cc:
  Auto merged

sql/spatial.cc:
  just float8get doesn't work well with the local variables -                     
  they can be of processor-specific floating type - not the                       
  standard decimal (by hf)

into msdesk.mysql.com:/home/magnus/mysql-5.0-build

ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
  Removed fix, does not work.

sql/gen_lex_hash.cc:
  a fix (#10742: Can't compile "sql_lex.cc" on AIX 5.2).
  typo fixed.

sql/item_func.cc:
  a fix (bug #10599: Numeric function 'abs' make server crash).
  Item_func_abs::decimal_op() now returns 0 if NULL.                              
  trivial optimization - get rid of an extra jump for common situations.          
  fixed Item_func_neg::decimal_op() return value if NULL.

into neptunus.(none):/home/msvensson/mysql/bug9626

ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Don't use length when comparing column names

This fixes a compilation failure in mysql_com.h, which doesn't have
'uint' alias visibile. Maybe worth while changing to unsigned int, but
the rest of functions that work with defaults files return int.


include/my_sys.h:
  Change the return type back to int (modify_defaults_file).
include/mysql_com.h:
  Change the return type back to int (modify_defaults_file).
mysys/default_modify.c:
  Change the return type back to int (modify_defaults_file).

into mysql.com:/usr/home/ram/work/5.0.b6961

sql/item_func.cc:
  a fix (bug #10599: Numeric function 'abs' make server crash).
  Item_func_abs::decimal_op() and Item_func_neg::decimal_op()
  now return 0 if NULL.
  Trivial optimization - get rid of an extra jump for common situations.

into mysql.com:/usr/home/ram/work/5.0.b6961

  Increment to next version.


configure.in:
  Increment to next version.

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

sql/sp.cc:
  Simpe fix to avoid reference to unallocated memory (only opened was needed, but I reset both to make things safer and simpler)