into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint


include/mysql_h.ic:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
mysql-test/t/rpl_rotate_logs.test:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
vio/viossl.c:
  Auto merged

 - Skip tests using chmod when running as root


mysql-test/t/information_schema_chmod.test:
  Use mysqltest builtin "chmode"
mysql-test/t/mysqltest.test:
  Dont run as root - test chmod
mysql-test/t/rpl_rotate_logs.test:
  Use mysqltest builtin "chmode"
  Use 'write_file' and 'chmod' instead of system
mysql-test/t/trigger.test:
  Don't run as root
  Use 'write_file' and 'chmod'
mysql-test/t/varbinary.test:
  Don't run as root

 - Don't call SSL_shutdown a second time


vio/viossl.c:
  SSL_shutdown might return 0 indicating that it should be called once
  again for a graceful shutdown. Since the socket are going to be closed
  anyway ther is no need for the second call.

into  qualinost.(none):/home/mtaylor/src/mysql-5.0-maint

into  qualinost.(none):/home/mtaylor/src/mysql-5.1-maint

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


include/mysql_h.ic:
  Auto merged

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


include/mysql_h.ic:
  Auto merged

into  polly.local:/tmp/maint/bug24117/my51-bug24117


include/mysql_h.ic:
  Null merge

into  qualinost.(none):/home/mtaylor/src/mysql-5.1-maint


mysys/typelib.c:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged

into  qualinost.(none):/home/mtaylor/src/mysql-5.1-maint

into  qualinost.(none):/home/mtaylor/src/mysql-5.0-maint

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

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

into  maint1.mysql.com:/data/localhome/msvensson/mysql-5.1-new-maint


mysql-test/r/symlink.result:
  Auto merged
mysql-test/t/symlink.test:
  Auto merged
include/my_pthread.h:
  Manual merge

into  shellback.:C:/mysql/mysql-5.1-new-maint


sql/event_queue.cc:
  SCCS merged

Only use "set_timespec" when there is a need to use it

into  shellback.:C:/mysql/mysql-5.0-maint

include/my_pthread.h:
  Calculate absolute time value int set_timespec_*
mysys/my_wincond.c:
  Use absolute timevalue in pthread_cond_timedwwait

into  shakedown.(none):/home/jpipes/dev/bug21970/my51-bug21970

into  qualinost.(none):/home/mtaylor/src/mysql-5.1-maint

into  qualinost.(none):/home/mtaylor/src/mysql-5.0-maint


scripts/mysqld_multi.sh:
  Auto merged

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

into  qualinost.(none):/home/mtaylor/src/mysql-5.1-maint


mysql-test/r/myisam.result:
  Auto merged
mysys/default.c:
  Auto merged

into  qualinost.(none):/home/mtaylor/src/mysql-5.0-maint


mysys/default.c:
  Section of code from 4.1 doesn't exist anymore.

bug #25104


mysys/default.c:
  Added /etc/mysql to the search path after /etc.
scripts/mysqld_multi.sh:
  Added /etc/mysql to the my.cnf search path.
  Changed chop to chomp - since it's smarter.

bug #25104


mysys/default.c:
  Added support for /etc/mysql after /etc in the search path for my.cnf

into  qualinost.(none):/home/mtaylor/src/mysql-5.0-maint


mysql-test/r/myisam.result:
  Auto merged

into  qualinost.(none):/home/mtaylor/src/mysql-4.1-maint

Pass different msg if waiting on empty queue


sql/event_queue.cc:
  Calculate offset for wait time passed to set_timespec instead of
  the "absolute time" from execute_at
  Pass different msg if waiting on empty queue

 - Move the specific test case to a separate file that is run only
   if we have a disabled handler.


mysql-test/r/warnings.result:
  Move the test for warning that table type is changed to separate file
  as it only occurs when engine is disabled.
mysql-test/t/warnings.test:
  Move the test for warning that table type is changed to separate file
  as it only occurs when engine is disabled.
mysql-test/r/warnings_engine_disabled.result:
  Move the test for warning that table type is changed to separate file
  as it only occurs when engine is disabled.
mysql-test/t/warnings_engine_disabled-master.opt:
  New BitKeeper file ``mysql-test/t/warnings_engine_disabled-master.opt''
mysql-test/t/warnings_engine_disabled.test:
  Move the test for warning that table type is changed to separate file
  as it only occurs when engine is disabled.

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