into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0-clone


client/mysqltest.c:
  Auto merged

  Typos.


client/mysqltest.c:
  Typos.

  Better fix for do_sleep().


client/mysqltest.c:
  Better fix for do_sleep().

  Revise stress-test README


mysql-test/README.stress:
  Revise stress-test README
mysql-test/mysql-stress-test.pl:
  Revise stress-test README

  cloned


configure.in:
  cloned

into mysql.com:/M50/mysql-5.0

mysql-test/mysql-test-run.sh:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged

database
 - Fix test case for systems with "lowercase names"


mysql-test/r/grant2.result:
  Fix for system with "lowercase names", allow error 1007 to be returned
mysql-test/t/grant2.test:
  Fix for system with "lowercase names", allow error 1007 to be returned

scripts/make_binary_distribution.sh:
  Auto merged

into mysql.com:/M50/mysql-5.0


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

into mysql.com:/home/hf/work/mysql-5.0.9088

into mysql.com:/home/hf/work/mysql-5.0.9088

into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1-r1.2478


mysql-test/README:
  SCCS merged

into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.0-r1.2173

into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0

into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1-r1.2478


mysql-test/README:
  Auto merged

  revise README.


mysql-test/README:
  revise README.

into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0

into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1-r1.2478

  Revise README.gcov.


mysql-test/README.gcov:
  Revise README.gcov.

into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0

into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1-r1.2478


mysql-test/README:
  Auto merged

into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1


mysql-test/README:
  Auto merged

  Revise mysql-test README.


mysql-test/README:
  Revise mysql-test README.

into mysql.com:/M40/comment-4.0

into mysql.com:/M41/comment-4.1


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

into  lsmy3.wdf.sap.corp:/data/users/tkatchaounov/mysql/src/5.0-bug-17523

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

into  lsmy3.wdf.sap.corp:/data/users/tkatchaounov/mysql/src/5.0-dbg

into mysql.com:/M50/mysql-5.0

into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0

into  mysql.com:/home/timka/mysql/src/5.0-bug-17523

into  mysql.com:/home/alexi/bugs/mysql-5.0-merged


sql/sql_db.cc:
  Merge

 - Change to use non blocking read to empty channel in case of too large sd number
 - Don't check for too large socket number on Windows.


sql/net_serv.cc:
  Windows does not need protection from sd >= FD_SETSIZE, it uses an array to store the sd's it should read from.
  Change the handler for when "net_data_is_ready" returns -1 to perform nonblocking read to empty the net.
  Only include that handler if HAVE_POLL is not defined  and not windows

  Allocating/freeing memory for the db member of THD
  is wholy managed by slave thread.

to both the Shell and the Perl vaerion of "mysql-test-run"-


mysql-test/mysql-test-run.pl:
  Manual merge.
mysql-test/mysql-test-run.sh:
  Manual merge