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

into  naruto.:C:/cpp/bug20789/my51-bug20789


storage/myisam/mi_locking.c:
  Auto merged
storage/myisam/myisamdef.h:
  Auto merged
storage/myisammrg/myrg_locking.c:
  Auto merged

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

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


mysql-test/mysql-test-run.pl:
  Auto merged

into  shellback.(none):/home/msvensson/mysql/work/my51-work


mysql-test/mysql-test-run.pl:
  Auto merged

mysql-test/mysql-test-run.pl:
  Increase suite timeout even more when running with  valgrind

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


mysql-test/mysql-test-run.pl:
  Auto merged

into  shellback.(none):/home/msvensson/mysql/work/my51-work


mysql-test/mysql-test-run.pl:
  Merge 5.0->5.1

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


mysql-test/mysql-test-run.pl:
  Auto merged

mysql-test/mysql-test-run.pl:
  Initialise pid to 0 in arrays of masters and slaves
  Fix merge error
mysql-test/lib/mtr_cases.pl:
  Remove "chomp" on undefined

- When a MyISAM table which belongs to a merge table union and is 
  renamed the associated file descriptors are closed on windows.
  This causes a server crash next time an insert or update is 
  performed on the merge table.
- This patch prevents the system from crashing on windows by
  checking for bad file descriptors every time the MyISAM table
  is locked by associated the merge table.


myisam/mi_locking.c:
  - Added check for bad file descriptors when table is part of merge union.
  - This patch prevents the server from crash on windows.
myisam/myisamdef.h:
  Added boolean value to indicate that this myisam table is part of
  a merge union.
myisammrg/myrg_locking.c:
  Added paramter owned_by_merge=TRUE for mi_lock_database through MYRG_TABLE struct.

into  shellback.(none):/home/msvensson/mysql/work/my51-work


mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/lib/mtr_stress.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Merge 5.0 -> 5.1

Don't bother to remove the pid_file in mtr_kill_leftovers as it could potentially remove a the pidfile before the process is killed.
The pid file will be removed later when var/ directory is recreated.

mysql-test/lib/mtr_stress.pl:
  Remove duplicate definition of variable
mysql-test/mysql-test-run.pl:
  Fix spelling error
  Fix warning about uninitialised warning

into  kpdesk.mysql.com:/home/thek/dev2/bug21139/my51-bug21139

into  kpdesk.mysql.com:/home/thek/dev2/bug21139/my50-bug21139

- Access checks are omitted when compliled without --with-embedded-privilege-control
- Patch: skip this test


mysql-test/t/lowercase_fs_off.test:
  Added test to check if this embedded built in which case we just skip this test.

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


extra/Makefile.am:
  Auto merged

 - Remove the wildcard dependcy on the charset xml files


extra/Makefile.am:
  Remove the "wildcard" dependency

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


extra/Makefile.am:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
storage/innobase/Makefile.am:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged

into  shellback.(none):/home/msvensson/mysql/bug19738/my51-bug19738


extra/Makefile.am:
  Auto merged
sql/Makefile.am:
  Auto merged

 - Make built sources only depend on it's sources not the built tool


extra/Makefile.am:
  The files built by "comp_err" should only depend on their sources not the tool comp_err
  The built sources should only be cleaned by "make distclean"
sql/Makefile.am:
  The built file "lex_hash.h" should depend on it's sources

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

into  shellback.(none):/home/msvensson/mysql/work/my51-work


extra/yassl/src/Makefile.am:
  Auto merged
extra/yassl/testsuite/Makefile.am:
  Auto merged

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


mysql-test/mysql-test-run.pl:
  Auto merged

into  shellback.(none):/home/msvensson/mysql/work/my51-work


mysql-test/mysql-test-run.pl:
  Merge 5.0->5.1

installed charset dir being used.


mysql-test/mysql-test-run.pl:
  Add character-sets-dir argument to "mysql". That avoids a local
  installed charset dir being used.

when mysql-test-run.pl has full control of all ndb processes. It will now know if
install has failed.


BitKeeper/deleted/.del-have_ndb_status_ok.require:
  Delete: mysql-test/r/have_ndb_status_ok.require
mysql-test/include/have_ndb.inc:
  Remove the test to check if environment variable NDB_STATUS_OK is set
mysql-test/mysql-test-run.pl:
  Don't set env variable NDB_STATUS_OK or NDB_SLAVE_STATUS_OK
  Use 1 and 0 to indicate if cluster has been installed ok.

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

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


BitKeeper/etc/ignore:
  auto-union
include/my_net.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged

Add linebreak


BitKeeper/etc/ignore:
  Added mysql-test/mysql-test-run-shell to the ignore list

Symlink mysql-test-run to mysql-test-run.pl


mysql-test/mysql-test-run-shell.sh:
  Rename: mysql-test/mysql-test-run.sh -> mysql-test/mysql-test-run-shell.sh
mysql-test/Makefile.am:
  Build a link to mysql-test-run.pl called mysql-test-run

into  mysql.com:/usr/home/ram/work/mysql-5.1-maint


zlib/Makefile.am:
  Auto merged

into  mysql.com:/usr/home/ram/work/5.0.b18267


zlib/Makefile.am:
  Auto merged