into  poseidon.ndb.mysql.com:/home/tomas/5.0-merge

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge

into  mysql.com:/home/stewart/Documents/MySQL/5.0/main

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main

+ adopted signal to be as close as possible to 5.1...

into  mysql.com:/data0/knielsen/tmp-5.0

Pushbuild fixes to result file, test, and header file for federated.

into  govinda.patg.net:/home/patg/mysql-build/mysql-5.0-engines-bug19773

into  xiphis.org:/home/antony/work2/p4-bug12096.2-merge

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge

In the Windows build files, the "Max nt" configuration for some reason
had the mysql_client_test project disabled. Enable it.

into  mysql.com:/home/stewart/Documents/MySQL/5.0/merge

Improved definition of mysys configuration for -nt builds.

into  mysql.com:/home/stewart/Documents/MySQL/5.0/merge

change default minimum to 3

bug is *very* timing dependent, unable to reproduce here, but theoretically possible.

into  mysql.com:/home/tnurnberg/mysql-5.0

into  mysql.com:/home/tnurnberg/mysql-5.0

  
sp_grant_privileges(), the function that GRANTs EXECUTE + ALTER privs on a SP,
did so creating a user-entry with not password; mysql_routine_grant() would then
write that "change" to the user-table.

Make sure for the mysys project that __NT__ is defined in *nt solution
configurations (but not in other configurations).

into mysql.com:/home/gluh/MySQL/Merge/5.0-kt

  
Final-review fixes per Monty, pre-push. OK'd for 
push. Please see each file's comments.

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

 and BUG#19208 "Test 'rpl000017' hangs on Windows".
 Both bugs are caused by attempting to delete an opened
 file and to create immediatedly a new one with the same
 name. On Windows it can be supported only on NT-platforms
 (by using FILE_SHARE_DELETE mode and with renaming the
 file before deletion). Because deleting not-closed files
 is not supported on all platforms (e.g. Win 98|ME) this
 is to be considered harmful and should be eliminated by
 a "code redesign".

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main

into mysql.com:/M50/autopush20216-5.0

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main

This finishes bug#18516, as far as "generic RPMs" are concerned.

manual merge from 4.0.

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main