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

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

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

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

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

Merged 4.1->5.0. Updated myisam.test

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

- 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.

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

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

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

"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

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

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

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-5.0-maint

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

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

 - Windows opens stdin in text mode by default. Certain characters
   such as CTRL-Z are interpeted as events and the read() method
   will stop. CTRL-Z is the EOF marker in Windows. to get past this
   you have to open stdin in binary mode. Setmode() is used to set
   stdin in binary mode. Errors on setting this mode result in
   halting the function and printing an error message to stderr.

into  naruto.:C:/cpp/bug17489/my50-bug17489

into  siva.hindu.god:/usr/home/tim/m/bk/tmp/fix-Makefile-perl/50

    - test* targets are identical (as much as possible) to 5.0 & 5.1 versions
    - use @PERL@ ./mysql-test-run.pl, instead of depending on /usr/bin/perl location
    - PHONY: target includes all test targets

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

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

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

 - Use "mysql_field_count" to determine if there is a need to
   call "mysql_store_result"

 - Thanks to Vasil Dimov for the patch!

forwards-incompatible change.

- Using DATA/INDEX DIRECTORY option on Windows put data/index file into
  default directory because the OS doesn't support readlink().
- The procedure for changing data/index file directory is 
  different under Windows.
- With this fix we report a warning if DATA/INDEX option is used,
  but OS doesn't support readlink().

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

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

MYSQL_VERSION_ID is tested before it has been defined.  This leads to
a warning when compiling with -Wundef and it also will break the
internal logic of mysql_com.h as soon as MYSQL_VERSION_ID exceeds
50000.

The fix entailed a simple re-ordering of included files in mysql.h