into  qualinost.(none):/home/mtaylor/src/mysql-5.1-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

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


mysql-test/t/rpl_openssl.test:
  Auto merged

 - Remove check not to run on windows. 


mysql-test/t/rpl_openssl.test:
  Remove check not to run on windows

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


mysql-test/r/sp.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysys/typelib.c:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged

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


scripts/mysqld_safe.sh:
  Auto merged

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


mysql-test/t/sp.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
mysql-test/r/sp.result:
  Manual merge

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

Use macros for working with "struct timespec" in event_queue.cc
Fix merge problem


include/my_pthread.h:
  Remove merge problem causing "struct timespec" to be declared twice
  Add macro "get_timespec_sec" used for retrieving the time in seconds
sql/event_queue.cc:
  Use macros for working with "struct timespec"
sql/log_event.cc:
  Add casts from "byte*" to "char*"

into  kpdesk.mysql.com:/home/thek/dev/mysql-4.1-maint


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

- Result file was not properly committed.
- Update result file to match the new test case.


mysql-test/r/myisam.result:
  Bug#17498 failed to put data file in custom directory use "data directory" option
  
  - Update result file to match the new test case.

into  siva.hindu.god:/usr/home/tim/m/bk/51


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

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


mysql-test/mysql-test-run-shell.sh:
  Fix for Bug#21970
  
  Usage of "MASTER_MYPORT+1" caused a string "9306+1" to be evaluated instead of the correct "9307".  Thie fix was adding a space around the plus sign.
  
  Merged changes from 5.0 into 5.1; kept addition of --protocol=tcp in the 5.1 shell script entries and corrected the expression evaluation by adding a space between MASTER_MYPORT and "+1" to ensure that 9307 is output instead of the string "9306+1"