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

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

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

into  siva.hindu.god:/usr/home/tim/m/bk/inno/51-t

into  siva.hindu.god:/usr/home/tim/m/bk/inno/51-t

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

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

Bugs fixed:
- Bug #20877: InnoDB data dictionary memory footprint is too big
- Bug #13544: Second delete of same row in transaction illustrates non-optimal locking
- Bug #20791: valgrind errors in InnoDB

into  chilla.local:/home/mydev/mysql-5.1-tomain

Fix for win/Makefile.am

This ChangeSet will be null-merged to mysql-5.1.

Bugs fixed:
- Bug #21638:  InnoDB: possible segfault in page_copy_rec_list_end_no_locks
  If prefix_len is specified, write it to the insert buffer instead of type->len
- bug #10746:  InnoDB: Error: stored_select_lock_type is 0 inside ::start_stmt()!
  INSERT ... SELECT uses LOCK_NONE in innodb_locks_unsafe_for_binlog mode, so do
  not check for LOCK_X or LOCK_S in start_stmt()

into  xiphis.org:/home/antony/work2/p2-bug22417.2

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

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

since the $opt_valgrind variable was initialised to 0, thus being "defined"

into  chilla.local:/home/mydev/mysql-5.1-tomain

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

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

 - Move comp_err to EXTRA_PROGRAMS, it will not be installed from 5.1 and up.

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

 - Move gen_lex_hash to EXTRA_PROGRAMS

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

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

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

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

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

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

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

- 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.

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

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.

into  chilla.local:/home/mydev/mysql-5.1-bug14400-monty