include/my_pthread.h:
  Fix botched merge - add struct timespec and set_timespec(), etc.

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


scripts/mysqld_safe.sh:
  Auto merged

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


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

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


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

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


client/mysqltest.c:
  Auto merged
include/config-win.h:
  Auto merged
include/my_global.h:
  Auto merged
mysql-test/r/type_ranges.result:
  Auto merged
mysql-test/r/type_timestamp.result:
  Auto merged
server-tools/instance-manager/guardian.cc:
  Auto merged
server-tools/instance-manager/instance.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
include/my_pthread.h:
  Manual merge.
mysql-test/r/archive.result:
  Manual merge.
mysql-test/t/archive.test:
  Manual merge.

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

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

into  naruto.:C:/cpp/mysql-4.1-maint

into  naruto.:C:/cpp/mysql-5.0-maint

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

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


mysql-test/t/myisam.test:
  SCCS merged

 - Use same precision (milliseconds) for all time functions
   used  when calculating time for pthread_cond_timedwait
 - Use 'GetSystemTimeAsFileTime' for both start and curr time


include/config-win.h:
  Move all defines for 'pthread_cond_timedwait' to my_pthread.h
include/my_global.h:
  Move all defines for 'pthread_cond_timedwait' to my_pthread.h
include/my_pthread.h:
  Redefine "struct timespec" to better suite the needs 
  of 'pthread_cond_timedwait' for windows implementation
  Add windows specific define for set_timespec_nsec
  Move all defines related to pthread_cond_timed wait to same file
  Declare union for reading FILETIME as __int64 with correct alignment
mysys/my_wincond.c:
  Use 'GetSystemTimeAsFileTime()' both for getting start and current time
  Use new members of "struct timespec"
  Make sure the calculated timeout value never exceeds the value
  passed to set_timespec/set_timespec_nsec
server-tools/instance-manager/guardian.cc:
  Use set_timespec macro
server-tools/instance-manager/instance.cc:
  Use set_timespec macro

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

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

into  kpdesk.mysql.com:/home/thek/dev/bug17489/my51-bug17498


mysql-test/r/symlink.result:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysql-test/t/symlink.test:
  Auto merged
mysql-test/r/myisam.result:
  SCCS merged

Merged 4.1->5.0. Updated myisam.test


mysql-test/r/myisam.result:
  updated result file
mysql-test/t/myisam.test:
  Removing symlink specific test from myisam test

into  kpdesk.mysql.com:/home/thek/dev/bug17489/my50-bug17498


mysql-test/r/symlink.result:
  Auto merged
mysql-test/t/symlink.test:
  Auto merged
mysql-test/r/myisam.result:
  SCCS merged
mysql-test/t/myisam.test:
  SCCS merged

- When this bug was corrected it changed the behavior 
  for data/index directory in the myisam test case.
- This patch moves the OS depending tests to a non-windows
  test file.


mysql-test/r/myisam.result:
  moved test from myisam to symlink; new result file
mysql-test/r/symlink.result:
  moved test from myisam to symlink; new result file
mysql-test/t/myisam.test:
  moved test from myisam to symlink
mysql-test/t/symlink.test:
  moved test from myisam to symlink

into  shakedown.(none):/home/jpipes/dev/mysql-5.1-maint


include/mysql.h:
  Auto merged

into  shakedown.(none):/home/jpipes/dev/mysql-5.1-maint


include/mysql.h:
  Auto merged

into  mysql.com:/usr/home/ram/work/bug22377/my41-bug22377

into  mysql.com:/usr/home/ram/work/bug22377/my50-bug22377


mysql-test/r/type_ranges.result:
  Auto merged
mysql-test/r/type_timestamp.result:
  Auto merged
sql/sql_show.cc:
  Auto merged

into  mysql.com:/usr/home/ram/work/bug22377/my50-bug22377

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


client/mysqltest.c:
  Auto merged

"select count" is one more.

 - Add printout in safe_connect indicating that mysqltest is in a loop waiting for
connection to mysqld. Will be printed when --verbose is passed as argument to
  mysqltest


client/mysqltest.c:
  Bug#20225 mysqltest runs in an endless loop when trying to start rpl_sys test suite
   - Add printout in safe_connect indicating that mysqltest is in a loop waiting for
  connection to mysqld

into  naruto.:C:/cpp/mysql-5.0-maint

into  naruto.:C:/cpp/mysql-5.1-maint

into  naruto.:C:/cpp/mysql-5.1-maint


sql/sql_parse.cc:
  Auto merged

into  naruto.:C:/cpp/mysql-5.0-maint


sql/sql_parse.cc:
  Auto merged

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

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

into  naruto.:C:/cpp/mysql-4.1-maint

into  naruto.:C:/cpp/mysql-5.0-maint

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


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

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


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

- Updated result file to fit test case automerge.


mysql-test/r/windows.result:
  Updated result file to fit automerge.

mysql-test/mysql-test-run.pl:
  Pass "--no-defaults" to embedded server as "--server-arg=--no-defaults"

mysql-test/Makefile.am:
  Fix merge error