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

Added a space between $MASTER_MYPORT and "+ 1" to ensure that the script correctly output 9307 instead of the string "9306+1"

The mysql-test-run-shell.sh script was improperly evaluating an expression for setting up multiple masters.

This fix adds the `expr $MASTER_MYPORT + 1` construct to the offending line in order for the expression to evaluate properly and produce 9307 instead of the string "9306+1"  

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

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

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  shakedown.(none):/home/jpipes/dev/mysql-5.1-maint

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

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

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

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

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

- Updated result file to fit test case automerge.

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-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/my51-bug17489

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

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

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

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

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

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

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-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!

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

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