into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


BitKeeper/etc/ignore:
  auto-union
mysql-test/Makefile.am:
  Auto merged
sql/mysqld.cc:
  Auto merged
BitKeeper/deleted/.del-init_db.sql:
  Auto merged
BitKeeper/deleted/.del-init_db.sql~a77d572c39d5a1f8:
  Auto merged

into  pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint

 - Add printout of current time when mysqld is killed by an
   unhandled signal


sql/mysqld.cc:
  Add printout of current time before the "mysqld got signal %d" message
  Hopefully we don't crash in the calls to 'time' or 'localtime_r'
  but if that should start to happen we can move the printout of
  time further down. At least it's now below the check for segfault
  inside of segfault handler.

 - Build lib/init-db.sql from the output of mysql_create_system_tables
 - Remove mysql-test/init_db.sql and mysql-test/lib/init_db.sql
 - Leave netware/init_db.sql until 5.0 where we should soon have possibility
   to test with mysql-test-run.pl


BitKeeper/deleted/.del-init_db.sql:
  Delete: mysql-test/init_db.sql
BitKeeper/deleted/.del-init_db.sql~a77d572c39d5a1f8:
  Delete: mysql-test/lib/init_db.sql
BitKeeper/etc/ignore:
  Added mysql-test/lib/init_db.sql to the ignore list
mysql-test/Makefile.am:
  Build lib/init_db.sql from the output of mysql_create_system_tables

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


mysql-test/mysql-test-run.pl:
  Auto merged

afresh start

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


sql/item_strfunc.cc:
  Auto merged

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


mysql-test/lib/mtr_process.pl:
  Auto merged

 - Thanks to Christian for the patch!


mysql-test/lib/mtr_process.pl:
  Avoid printout of "Hangup" when script exits by using
  POSIX::kill

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


mysql-test/lib/mtr_process.pl:
  Auto merged

 - Add error handling for waitpid returns -1 for "simple run of command"


mysql-test/lib/mtr_process.pl:
  - Add error handling for waitpid returns -1
  when a simple command is run.
  - Add missing return
  - Add mtr_errors where the program should never come 
  - Remove an else to improve program readability
  - Change mtr_debug to mtr_warning for "Got EAGAIN from fork()..."

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


client/mysqltest.c:
  Auto merged

into  pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint


client/mysqltest.c:
  Auto merged

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint

into  pilot.blaudden:/home/msvensson/mysql/bug19410/my50-bug19410


client/mysqltest.c:
  Auto merged

- Use "mysql_stmt_field_count" to determine if there is a need to
call "mysql_stmt_store_result"


client/mysqltest.c:
  Only call 'mysql_stmt_store_result' if 'mysql_stmt_field_count' is
  greater than 0 indicating that this query has a result set.
  This change is mainly since if mysql_stmt_store_result fails
  the value returned by mysql_stmt_field_count will be reset.

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint

 - Import a patch from yaSSL CVS that uses "word" instead
of "unsigned long" in three function's that uses sizeof to find
out the word size being used. NOTE! long is 32 bit also on 
64 bit windows.


extra/yassl/taocrypt/include/misc.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/misc.cpp:
  Import patch yassl.diff

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


mysql-test/mysql-test-run.pl:
  Auto merged

into temporary table and selecting the correct row with SQL

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


mysql-test/t/mysql.test:
  Auto merged
mysql-test/t/mysqlbinlog.test:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
extra/comp_err.c:
  Manual merge

 - Avoid overflow in sec_since_epoch by shifting the time
   back 2 days for times close to the maximum range of my_time_t
 - Improve comment about why we need my_time_t
 - Patch will also fix timezone2.test


include/my_time.h:
  Improve comment for my_time_t, especially that we require
  it to be at least a 32bit unsigned type
sql/tztime.cc:
  - Add assert in sec_since_epoch to guard it against broken down time
  values that would cause overflow in my_time_t on systems with 32 bit
  my_time_t
  - Avoid overflow in sec_since_epoch by "shifting" the broken down
  time back 2 days for times that are near the max value.c

 - Return empty string also if count is unsigned and value is 0


mysql-test/r/func_str.result:
  Update test result
mysql-test/t/func_str.test:
  Add test case for using an unsigned value as count parameter
  for REPEAT
sql/item_strfunc.cc:
  The repeat function should return the emptystring if
  count is unsigned and equal to zero or
  count is signed and less than or equal to zero

into  pilot.blaudden:/home/msvensson/mysql/comp_err_checksum/my50-comp_err_checksum


sql/share/errmsg.txt:
  Auto merged

sql/share/errmsg.txt:
  Add the missing "d"

- Add check of format specifiers in error message strings
- Update error message text accordingly to be equal between all translations


extra/Makefile.am:
  comp_err uses my_cheksum, link with zlib
extra/comp_err.c:
  Add check of format specifiers in error message strings
sql/share/errmsg.txt:
  Update error messages after checks
  ---
  Remove the newly added space in error message, should not be there

Force the server restart before running mysqlbinlog-cp932.test to fix PB failures introduced by the patch for bug #18743.


mysql-test/t/mysqlbinlog-cp932-master.opt:
  New BitKeeper file ``mysql-test/t/mysqlbinlog-cp932-master.opt''

into  polly.local:/home/kaa/src/maint/mysql-5.0-maint


mysql-test/r/sp.result:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
mysql-test/t/mysqlbinlog.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/mysqld.cc:
  Auto merged
mysql-test/r/mysqlbinlog.result:
  SCCS merged

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


client/mysqltest.c:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged