bzr push into mysql-6.0 branch (timothy.smith:2770 to 2771)

[timothy.smith]

 2771 timothy.smith@stripped	2008-08-17 [merge]
      Merge from mysql-6.0.6-release
modified:
  scripts/make_win_bin_dist

 2770 Daniel Fischer	2008-08-14 [merge]
      merge in mysql-6.0-wtf
added:
  mysql-test/suite/large_tests/r/lock_tables_big.result
  mysql-test/suite/large_tests/t/lock_tables_big.test
  mysys/my_winerr.c
  mysys/my_winfile.c
modified:
  CMakeLists.txt
  client/mysqlbinlog.cc
  client/mysqlslap.c
  client/readline.cc
  include/config-win.h
  include/my_dir.h
  include/my_global.h
  include/my_sys.h
  libmysql/CMakeLists.txt
  mysys/CMakeLists.txt
  mysys/Makefile.am
  mysys/default_modify.c
  mysys/my_chsize.c
  mysys/my_create.c
  mysys/my_delete.c
  mysys/my_dup.c
  mysys/my_file.c
  mysys/my_fopen.c
  mysys/my_fstream.c
  mysys/my_getncpus.c
  mysys/my_lib.c
  mysys/my_lock.c
  mysys/my_mmap.c
  mysys/my_open.c
  mysys/my_pread.c
  mysys/my_quick.c
  mysys/my_read.c
  mysys/my_seek.c
  mysys/my_static.c
  mysys/my_sync.c
  mysys/my_write.c
  mysys/mysys_priv.h
  sql/discover.cc
  sql/log.cc
  sql/mysqld.cc
  sql/parse_file.cc
  sql/set_var.cc
  sql/sql_connect.cc
  storage/archive/ha_archive.cc
  storage/csv/ha_tina.cc
  storage/falcon/CMakeLists.txt
  storage/falcon/Interlock.h
  storage/innobase/handler/ha_innodb.cc
  storage/maria/CMakeLists.txt
  storage/myisam/mi_locking.c
  storage/myisam/myisam_ftdump.c
  vio/viosocket.c
  win/README

=== modified file 'scripts/make_win_bin_dist'
--- a/scripts/make_win_bin_dist	2008-03-14 14:28:18 +0000
+++ b/scripts/make_win_bin_dist	2008-08-12 00:13:35 +0000
@@ -146,6 +146,7 @@ mkdir $DESTDIR/bin
 cp client/$TARGET/*.exe                                  $DESTDIR/bin/
 cp extra/$TARGET/*.exe                                   $DESTDIR/bin/
 cp storage/myisam/$TARGET/*.exe                          $DESTDIR/bin/
+cp storage/maria/$TARGET/*.exe                           $DESTDIR/bin/
 if [ x"$TARGET" != x"release" ] ; then
   cp client/$TARGET/mysql.pdb                            $DESTDIR/bin/
   cp client/$TARGET/mysqladmin.pdb                       $DESTDIR/bin/