into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.1-maint

into  rolltop.ignatz42.dyndns.org:/mnt/storeage/bksendmailfix/my51-bksendmailfix

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint

into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug21618/my51-bug21618

into  siva.hindu.god:/usr/home/tim/m/bk/tmp/51-mrg50

- Remove extra EXTRA_DIST from several Makefile.ams
- Add dummy primary key to test table in loaddata_autocom.inc

into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.1-maint

into  rolltop.ignatz42.dyndns.org:/mnt/storeage/winbkfix/my51-winbkfix

into  polly.local:/home/kaa/src/maint/m51-new-maint--07OGx

The column's NOT NULL flag doesn't affect what we should print.  Remove the
wrong logic that does check it.

Also, verify that this and the previous two tests print the same data as 
other output formats.

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint

into  maint1.mysql.com:/data/localhome/cmiller/mysql-5.1-maint

into  maint1.mysql.com:/data/localhome/cmiller/bug15583/my51-bug15583

into  polly.local:/home/kaa/src/maint/m51-new-maint--07OGx

into  polly.local:/tmp/20924/bug20294/my51-bug20294

into  polly.local:/tmp/20924/bug20294/my50-bug20294

Cset exclude: kaa@polly.local|ChangeSet|20060908100829|09983

into  maint2.mysql.com:/data/localhome/tsmith/bk/mrg50/51

into  polly.local:/home/kaa/src/maint/m51-new-maint--07OGx

into  maint2.mysql.com:/data/localhome/tsmith/bk/mrg/51

Correct faulty merge, "mysql_priv.h" must be included for the ifdef WITH_INNOBASE_STORAGE_ENGINE to work

into  polly.local:/tmp/20924/bug20294/my51-bug20294

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

into  polly.local:/tmp/20924/bug20294/my50-bug20294

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

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

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

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

 - When an ALTER TABLE RENAME is performed on windows, the files are closed and their cached file 
   descriptors are marked invalid. Performing INSERT, UPDATE or SELECT on the associated merge
   table causes a server crash on windows. This patch adds a test for bad file descriptors when a 
   table attempts a lock. If a bad descriptor is found an error is thrown. An additional FLUSH TABLES
   will be necessary to further operate on the associated merge table.

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

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

  Fixing failed merge

More specifically, the scripts/Makefile isn't created and it doesn't
translate mysql_fix_privilege_tables ".sh" .  So, 
mysql-test/mysql-test-run.pl doesn't find the binary and substitutes 
/bin/false instead.  That obviously doesn't "fix" anything and the 
test fails because of it.

into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt