bzr push into mysql-5.1 branch (jperkin:3106 to 3107)

[Jonathan Perkin]

 3107 Jonathan Perkin	2009-09-21 [merge]
      Merge from mysql-5.1.39-release
      modified:
        scripts/make_win_bin_dist

 3106 Bjorn Munch	2009-09-03 [merge]
      merge from 5.1-mtr
      added:
        mysql-test/lib/v1/incompatible.tests
        mysql-test/t/status-master.opt
      modified:
        client/mysqltest.cc
        mysql-test/collections/README.experimental
        mysql-test/collections/default.experimental
        mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test
        mysql-test/include/mtr_warnings.sql
        mysql-test/lib/My/ConfigFactory.pm
        mysql-test/lib/My/Platform.pm
        mysql-test/lib/My/SafeProcess/safe_process_win.cc
        mysql-test/lib/mtr_cases.pm
        mysql-test/lib/mtr_report.pm
        mysql-test/lib/v1/mtr_cases.pl
        mysql-test/mysql-test-run.pl
        mysql-test/r/almost_full.result
        mysql-test/r/bug46080.result
        mysql-test/r/insert_select.result
        mysql-test/r/lowercase_table3.result
        mysql-test/r/mysqltest.result
        mysql-test/r/partition_csv.result
        mysql-test/r/upgrade.result
        mysql-test/suite/innodb/r/innodb_file_format.result
        mysql-test/suite/innodb/t/innodb_file_format.test
        mysql-test/suite/parts/r/partition_recover_myisam.result
        mysql-test/suite/parts/t/partition_recover_myisam.test
        mysql-test/suite/rpl/r/rpl_bug33931.result
        mysql-test/suite/rpl/r/rpl_do_grant.result
        mysql-test/suite/rpl/r/rpl_extraCol_innodb.result
        mysql-test/suite/rpl/r/rpl_extraCol_myisam.result
        mysql-test/suite/rpl/r/rpl_idempotency.result
        mysql-test/suite/rpl/r/rpl_init_slave_errors.result
        mysql-test/suite/rpl/r/rpl_slave_load_remove_tmpfile.result
        mysql-test/suite/rpl/t/disabled.def
        mysql-test/suite/rpl/t/rpl_bug33931.test
        mysql-test/suite/rpl/t/rpl_do_grant.test
        mysql-test/suite/rpl/t/rpl_idempotency.test
        mysql-test/suite/rpl/t/rpl_init_slave_errors.test
        mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile.test
        mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result
        mysql-test/t/almost_full.test
        mysql-test/t/bug46080.test
        mysql-test/t/disabled.def
        mysql-test/t/events_logs_tests-master.opt
        mysql-test/t/insert_select.test
        mysql-test/t/log_tables-master.opt
        mysql-test/t/lowercase_table3.test
        mysql-test/t/mysqltest.test
        mysql-test/t/not_partition.test
        mysql-test/t/partition_csv.test
        mysql-test/t/ps-master.opt
        mysql-test/t/show_check-master.opt
        mysql-test/t/upgrade.test
        sql/mysqld.cc

=== modified file 'scripts/make_win_bin_dist'
--- a/scripts/make_win_bin_dist	2009-09-01 06:40:13 +0000
+++ b/scripts/make_win_bin_dist	2009-09-04 15:45:07 +0000
@@ -280,6 +280,7 @@ cp include/mysql/plugin.h $DESTDIR/inclu
 
 mkdir -p $DESTDIR/lib/opt
 mkdir -p $DESTDIR/lib/plugin
+cp sql/$TARGET/mysqld.lib $DESTDIR/lib/
 cp libmysql/$TARGET/libmysql.dll \
    libmysql/$TARGET/libmysql.lib \
    libmysql/$TARGET/mysqlclient.lib \