into  mysql.com:/windows/Linux_space/MySQL/mysql-4.1

Bug #21378  Alter table from X storage engine to NDB could cause data loss: skip autodiscover of local tables

Bug #21378  Alter table from X storage engine to NDB could cause data loss: Added warning if local table shadows ndb table

into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-ndb

Fix an error in the bug fix.

into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-ndb

  fix deadlock if master switches log file in parallell with "show master logs"
  

into  lamia.home:/home/timka/mysql/src/4.1-bug-21787

  
The problem was due to a prior fix for BUG 9676, which limited
the rows stored in a temporary table to the LIMIT clause. This
optimization is not applicable to non-group queries with aggregate
functions. The fix disables the optimization in this case.

 - Dont test "encrypt" in ctype_ucs

into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-ndb

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

into  rama.(none):/home/jimw/my/mysql-4.1-21288

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint

single file is a bad practice.  

into  maint2.mysql.com:/data/localhome/tsmith/bk/41

into  maint2.mysql.com:/data/localhome/tsmith/bk/41

into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug04053/my41-bug04053

	event' from master"

Since there is no repeatable test case, and this is obviously wrong, this is
the most conservative change that might possibly work.  

The syscall  read()  wasn't checked for a negative return value for an
interrupted read.  The kernel  sys_read()  returns -EINTR, and the "library" 
layer maps that to return value of -1 and sets  errno  to EINTR.  It's 
impossible (on Linux) for  read()  to set errno EINTR without the return 
value being -1 .

So, if we're checking for EINTR behavior, we should not require that the
return value be zero.

into  maint2.mysql.com:/data/localhome/tsmith/bk/bfx/41

Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte

into  maint2.mysql.com:/data/localhome/tsmith/bk/41

into  maint1.mysql.com:/data/localhome/tsmith/bk/bugfixin/41

into  moonbone.local:/work/tmp_merge-4.1-opt-mysql

into  moonbone.local:/work/tmp_merge-4.1-opt-mysql

Null merge to 5.0

Default is "var/tmp" 

into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint

 Must not use Item_direct_ref in HAVING because it points to
 the new value (witch is not yet calculated for the first row).