mysql-test/r/func_time.result:
  Add new results
mysql-test/t/func_time.test:
  Add new regression test
sql/item_timefunc.cc:
  Fix calculation of years and months in TIMESTAMPDIFF().

into  mysql.com:/home/dellis/mysqlab/bk/mysql-5.0

into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0

Fixed documentation for findopt().
Cleaned code a bit.

(bug#13791 - mysqld crashes at startup in TC_LOG_MMAP::open)

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


BUILD/SETUP.sh:
  Auto merged
BitKeeper/deleted/.del-ctype-cp932.c:
  Auto merged
BitKeeper/deleted/.del-ctype_cp932.result:
  Auto merged
BitKeeper/deleted/.del-ctype_cp932.test:
  Auto merged
BitKeeper/deleted/.del-ndb_range_bounds.pl~ff7e47a35fb44c74:
  Auto merged
innobase/os/os0sync.c:
  Auto merged
mysql-test/r/ctype_tis620.result:
  Auto merged
mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/t/ctype_uca.test:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
mysql-test/t/ctype_ujis.test:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
strings/ctype-big5.c:
  Auto merged
strings/ctype-gbk.c:
  Auto merged
strings/ctype-simple.c:
  Auto merged
strings/ctype-sjis.c:
  Auto merged
strings/ctype-ucs2.c:
  Auto merged
client/mysql.cc:
  Sam change in both 4.1 and 5.0
mysql-test/r/ctype_uca.result:
  Merge
mysql-test/r/ctype_ujis.result:
  Merge
strings/ctype-mb.c:
  Merge
strings/ctype-tis620.c:
  Merge

  Wrong variable.


sql/item_cmpfunc.cc:
  Wrong variable.

BitKeeper/deleted/.del-ndb_range_bounds.pl~ff7e47a35fb44c74:
  Delete: mysql-test/ndb/ndb_range_bounds.pl

  Let pthread_mutex_init() macro return 0 on Windows
mysql_priv.h:
  Return type is to be 'my_bool' for 'opt_enable_shared_memory'


sql/mysql_priv.h:
  Return type is to be 'my_bool' for 'opt_enable_shared_memory'
include/my_pthread.h:
  Let pthread_mutex_init() macro return 0 on Windows

into serg.mylan:/usr/home/serg/Abk/mysql-5.0

into serg.mylan:/usr/home/serg/Abk/mysql-5.0

into serg.mylan:/usr/home/serg/Abk/mysql-5.0


sql/sql_table.cc:
  Auto merged

  fixed CHECKSUM TABLE to be independent from the first 'deleted' bit in the null bitmask (undefined in the InnoDB)
  bug#13710


sql/sql_table.cc:
  fixed CHECKSUM TABLE to be independent from the first 'deleted' bit in the null bitmask (undefined in the InnoDB)
  bug#13710

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

server error messages file. (Bug #13071)


extra/comp_err.c:
  Fail when two messages for the same language are given for an error

BUILD/SETUP.sh:
  Remove -ansi

into  mysql.com:/usr/home/bar/mysql-4.1.b12476

BUILD/SETUP.sh:
  Remov -ansi flag

  wrong variable.


sql/item_cmpfunc.cc:
  wrong variable.

into  mysql.com:/usr/home/bar/mysql-4.1.b13046

scripts/mysql_fix_privilege_tables.sh:
  Make the script not dependent on the current directory.

into serg.mylan:/usr/home/serg/Abk/mysql-5.0


sql/ha_innodb.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.h:
  Auto merged

into serg.mylan:/usr/home/serg/Abk/mysql-5.0

  somehow it didn't get into the previous changeset


mysql-test/r/innodb.result:
  somehow it didn't get into the previous changeset

some extra code.

into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0


sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged

Some options were declared as 'bool', but since those are being
handled in my_getopt.c, bool can be machine dependent. To make
sure it works in all circumstances, the type should be my_bool
for C (not C++) programs.


sql/mysql_priv.h:
  Fixed some bools to my_bools.
sql/mysqld.cc:
  Changed several bools to my_bools.
sql/slave.cc:
  Changed bool to my_bool.
sql/slave.h:
  Changed bool to my_bool.

into serg.mylan:/usr/home/serg/Abk/mysql-5.0


sql/sql_table.cc:
  Auto merged
sql/table.cc:
  Auto merged

into  zim.(none):/home/brian/mysql/fix-5.0

using wrong type in assignment etc.


cmd-line-utils/readline/complete.c:
  Fixed problem with implicitely defining wcwidth() in case when
  compiling with icc.
cmd-line-utils/readline/display.c:
  Fixed problem with implicitely defining wcwidth() in case when
  compiling with icc.
cmd-line-utils/readline/mbutil.c:
  Fixed problem with implicitely defining wcwidth() in case when
  compiling with icc.
server-tools/instance-manager/protocol.cc:
  Fixed some types from int to char. Made ERROR_PACKET_CODE
  static global variable in this file.
sql/log.cc:
  Removed warning of unused goto when not in debug mode.

  fixed CHECKSUM TABLE to be independent from last - undefined in InnoDB - bits in the null bitmask
  bug#13710


sql/table.h:
  fixed CHECKSUM TABLE to be independent from last - undefined in InnoDB - bits in the null bitmask
  bug#13710
sql/table.cc:
  fixed CHECKSUM TABLE to be independent from last - undefined in InnoDB - bits in the null bitmask
  bug#13710
sql/sql_table.cc:
  fixed CHECKSUM TABLE to be independent from last - undefined in InnoDB - bits in the null bitmask
  bug#13710

into serg.mylan:/usr/home/serg/Abk/mysql-5.0


sql/ha_innodb.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/sql_base.cc:
  Auto merged

into  zim.(none):/home/brian/mysql/fix-5.0


sql/ha_berkeley.cc:
  Auto merged
sql/ha_berkeley.h:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/handler.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged

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


sql/sql_base.cc:
  Auto merged

Final patch for 5.0 for simplifying storage engine code. We now have just one set of ifdefs. I may also remove the code for creating new handlers.
May changes were to simplify storage engine setup and support for legacy call to show storage engines.


mysql-test/r/ps_1general.result:
  Fixed test results for new listing order
sql/examples/ha_tina.cc:
  Removed dead code
sql/examples/ha_tina.h:
  Removed dead code
sql/ha_archive.cc:
  Capitalized sotrage engine name and moved disabled code.
sql/ha_berkeley.cc:
  Moved deisabled code
sql/ha_federated.cc:
  Removed disabled code
sql/ha_innodb.cc:
  Removed disabled message
sql/ha_ndbcluster.cc:
  Removed disabled message
sql/handler.cc:
  Added in legacy support for sotrage engine listing (ala Serg's request). Removed handlertons variables and we now have simplified ha_init code.
sql/handler.h:
  No longer need handlertons array.

into  hundin.mysql.fi:/home/marko/mysql-4.1