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

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

into  siva.hindu.god:/usr/home/tim/m/bk/inno/50

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()


innobase/ibuf/ibuf0ibuf.c:
  Applied innodb snapshot ss792 and ss854.
  
  ibuf_entry_build(): Write prefix_len to the insert buffer instead of type->len
  when prefix_len is specified.  Otherwise, btr_page_reorganize() during
  insert buffer merge would fail on ROW_FORMAT=COMPACT tables.  (Bug #21638)
innobase/include/data0type.h:
  Applied innodb snapshot ss792 and ss854.
  
  ibuf_entry_build(): Write prefix_len to the insert buffer instead of type->len
  when prefix_len is specified.  Otherwise, btr_page_reorganize() during
  insert buffer merge would fail on ROW_FORMAT=COMPACT tables.  (Bug #21638)
innobase/include/data0type.ic:
  Applied innodb snapshot ss792 and ss854.
  
  ibuf_entry_build(): Write prefix_len to the insert buffer instead of type->len
  when prefix_len is specified.  Otherwise, btr_page_reorganize() during
  insert buffer merge would fail on ROW_FORMAT=COMPACT tables.  (Bug #21638)
sql/ha_innodb.cc:
  Applied innodb snapshot ss792 and ss854.
  
  ha_innobase::start_stmt(): Remove the check for
  prebuilt->stored_select_lock_type being LOCK_X or LOCK_S.
  This would cause false alarms with INSERT ... SELECT, which would use
  LOCK_NONE in innodb_locks_unsafe_for_binlog mode.  (Bug #10746)

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


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

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


mysql-test/mysql-test-run.pl:
  Increase the timeout values if $opt_valgrind are greater than 0. By default $opt_valgrind is set to 0.

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

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


sql/Makefile.am:
  Auto merged

 - Move gen_lex_hash to EXTRA_PROGRAMS


sql/Makefile.am:
  Move gen_lex_hash to EXTRA_PROGRAMS, this will make it be built only when lex_hash.h need to be rebuilt

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

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

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


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


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

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


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

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

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/mysql-5.0-maint

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


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

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


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

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.

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


zlib/Makefile.am:
  Auto merged

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

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

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

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

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


configure.in:
  Auto merged

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

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