Added { ... } around float8get() macro, avoids VC7 error
  message "illegal else without matching if"
mtr_report.pl:
  Parse error logs to create "warnings" file
mtr_cases.pl:
  Added optoion --ignore-disabled-def
  Windows build now let TZ pass, removed
  work around
mysql-test-run.pl, mtr_process.pl:
  Back port of changes from 5.0

into mysql.com:/Users/kent/mysql/bk/mysql-4.1

  print => echo in shell script

  Give space for second and third slave port

into mysql.com:/Users/kent/mysql/bk/mysql-4.1

into  poseidon.ndb.mysql.com:/home/tomas/mysql-4.1

Bug #17257 ndb, update fails for inner joins if tables do not have Primary Key

change: the allocated area by setValue may not be around for later, store hidden key in special member variable instead

into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1

  Introduce new variable c_newest_restorable_gci
    which is set _after_ both GCP_SAVE and COPY_GCI
    
  This variable is used when cutting redo (calcKeepGci)
  
  Also make sure complete GCI is run inbetween LCP's

  fix corruption due to page 0, file 0 gets released

Removed 'delayed' to make the test deterministic (as the bug itself has nothing to do with 'delayed').

into  sanja.is.com.ua:/home/bell/mysql/bk/work-4.1

into  april.(none):/home/svoj/devel/mysql/merge/mysql-4.1

into  april.(none):/home/svoj/devel/mysql/merge/mysql-4.1

into  april.(none):/home/svoj/devel/mysql/merge/mysql-4.1

Bug #17158  	load data infile of char values into table of char with no (PK) fails to load
Bug #17081  	Doing "LOAD DATA INFILE" directly after delete can cause missing data

  better error message on invalid config change

  ndb - error while restarting in dict
        improve error message when changed config leads to failed restart

Fixed that fulltext query + union results in unexpected behaviour.

           MATCH and FULLTEXT
Fixed that fulltext query using PS results in unexpected behaviour
when executed 2 or more times.

into  devsrv-b.mysql.com:/space/magnus/my41-bug15302

 - Change "mysql_create_db" to not call "send_ok" if in silent mode i.e. called from "load_master_data"
 - Change mysqltest to detect when there aren't as many warnings available as was reported.

into  mysql.com:/home/alexi/innodb/mysql-4.1-merged

  Applied innodb-4.1-ss20 snapshot.

into  mysql.com:/home/alexi/innodb/mysql-4.1-merged

  Applied innodb-4.1-ss17 snapshot.
  Do not mistake TABLENAME_ibfk_0 for auto-generated id.

  Aligned the MTR_BUILD_THREAD policy to shell version

into mysql.com:/Users/kent/mysql/bk/mysql-4.1

  Bug#16780: Extend port range to make space for 5.1 NDBCLUSTER_PORT_SLAVE

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

into  c-5c0be253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug12796

into  c-5c0be253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug12796