into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0

  Added 5.0 specific build scripts


BUILD/Makefile.am:
  Added 5.0 specific build scripts

into mysql.com:/Users/kent/mysql/bk/mysql-5.0


BUILD/Makefile.am:
  Auto merged

  Adjusted listing of files to put into source TAR

into mysql.com:/Users/kent/mysql/bk/mysql-4.1

into  regul.home.lan:/mnt/md/bk/mysql-5.0

into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0

mysql-test/t/disabled.def:
  Disabled test type_time; fails in --ps-protocol mode.

with 20 test loops in case when any limit parameter was specified



mysql-test/lib/mtr_stress.pl:
  Limit stress testing with 20 test loops in case when any limit parameter was specified
mysql-test/mysql-test-run.pl:
  Limit stress testing with 20 test loops in case when any limit parameter was specified
mysql-test/mysql-test-run.sh:
  Limit stress testing with 20 test loops in case when any limit parameter was specified

into  mysql.com:/home/alexi/dev/mysql-5.0-12440


mysql-test/r/type_time.result:
  Auto merged
ndb/src/ndbapi/NdbImpl.hpp:
  Auto merged
ndb/src/ndbapi/NdbRecAttr.cpp:
  Auto merged
ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Auto merged
sql-common/my_time.c:
  Auto merged
zlib/Makefile.am:
  Auto merged

 long fraction and/or large exponent part".


mysql-test/r/type_time.result:
  Fixed testcases results (bug #12440)
mysql-test/t/type_time.test:
  Added testcases for bug #12440
sql-common/my_time.c:
  Fixed bug #12440: "Incorrect processing of time values containing
   long fraction and/or large exponent part".
   Modified str_to_time(). Process properly fraction part containing
   more than 6 digits. Check for existence of exponent part which
   may result from %g formatting applied to time value specified as
   large real number.

  - libtool wants spaces on parameters for its command line options


zlib/Makefile.am:
  - libtool wants spaces on parameters for its command line options

  - libtool wants spaces on parameters for its command line options


zlib/Makefile.am:
  - libtool wants spaces on parameters for its command line options

  - Modified zlib/Makefile.am to generate libz.so.1.2.3 instead of libz.so.0.0.0


zlib/Makefile.am:
  - Modified zlib/Makefile.am to generate libz.so.1.2.3 instead of libz.so.0.0.0

into  mysql.com:/home/novo/MySQL/mysql-5.0

  - modified zlib/Makefile.am so we now generate libz.so.1.2.3 instead of libz.so.0.0.0


zlib/Makefile.am:
  - modified zlib/Makefile.am so we now generate libz.so.1.2.3 instead of libz.so.0.0.0

into mysql.com:/Users/kent/mysql/bk/mysql-4.1

into  production.mysql.com:/usersnfs/knielsen/mysql-5.0

into  mysql.com:/nfstmp1/ingo/autopush-775/mysql-5.0

into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0

into mysql.com:/Users/kent/mysql/bk/mysql-5.0

into  mysql.com:/nfstmp1/ingo/autopush-775/mysql-5.0

into  mysql.com:/nfstmp1/ingo/autopush-775/mysql-5.0

into  mysql.com:/usr/local/home/marty/MySQL/mysql-4.1

into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0

into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0

mysql-test/r/ndb_multi.result:
  Fix to make ndb_multi.test (Bug #15401  NDB lock problems) more preditable
mysql-test/t/ndb_multi.test:
  Fix to make ndb_multi.test (Bug #15401  NDB lock problems) more preditable

into  production.mysql.com:/usersnfs/knielsen/mysql-5.0

sql/sql_class.h:
  Remove unused class member.

into mysql.com:/Users/kent/mysql/bk/mysql-5.0


mysql-test/r/skip_name_resolve.result:
  Auto merged
mysql-test/t/skip_name_resolve.test:
  Auto merged
sql/sp_head.cc:
  Auto merged

into  mysql.com:/usr/local/mysql/mysql-5.0

into mysql.com:/Users/kent/mysql/bk/mysql-5.0


sql/mysqld.cc:
  Auto merged

bdb/dist/gen_rec.awk:
  Fix undefined behaviour.

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push

into  mysql.com:/nfstmp1/ingo/autopush-775/mysql-5.0

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push


mysql-test/r/ndb_basic.result:
  Auto merged
mysql-test/t/ndb_basic.test:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
ndb/src/kernel/vm/SimulatedBlock.cpp:
  merge

mysql-test/r/ndb_basic.result:
  bug#15682 - invalid handling of varchar in position/rnd_pos
mysql-test/t/ndb_basic.test:
  bug#15682 - invalid handling of varchar in position/rnd_pos
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  New error code for invalid key
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Handle invalid key gracefully
ndb/src/kernel/vm/SimulatedBlock.cpp:
  Handle invalid key gracefully
ndb/src/ndbapi/ndberror.c:
  New error code
sql/ha_ndbcluster.cc:
  Fix varchar keys in position/rnd_pos

into  mysql.com:/home/mydev/mysql-5.0-bug10932


configure.in:
  Auto merged