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.

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/sql_udf.cc:
  Auto merged
sql/unireg.cc:
  Auto merged

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 serg.mylan:/usr/home/serg/Abk/mysql-4.1

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)

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

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


mysys/default.c:
  Auto merged
server-tools/instance-manager/commands.cc:
  Auto merged

sql/item.cc:
  Revert changes
sql/item.h:
  Revert changes
sql/sp_head.cc:
  Revert changes
sql/sp_rcontext.cc:
  Revert changes

client/mysqldump.c:
  Temporarily disable unused (and broken) code.
mysql-test/r/group_min_max.result:
  Update results
mysql-test/r/mysqldump.result:
  Update results
mysql-test/r/subselect.result:
  Update results
mysql-test/t/group_min_max.test:
  Ignore number of rows in output of most explain results
sql/sql_insert.cc:
  Fix reference to max_unique_length

mysql-test/r/grant_cache.result:
  Auto merged
mysql-test/r/merge.result:
  Auto merged
mysql-test/t/grant_cache.test:
  Auto merged
mysql-test/t/merge.test:
  Auto merged
sql/ha_myisammrg.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/handler.h:
  Resolve merge
sql/table.cc:
  Resolve merge