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

  Disable tests of lock upgrade paths that are currently unsupported


ndb/test/ndbapi/testOperations.cpp:
  Disable lock upgrade paths that currently unsupported

into  mysql.com:/usr/home/bar/mysql-4.1


client/mysql.cc:
  Auto merged

into  mysql.com:/usr/home/bar/mysql-4.1


mysql-test/r/ctype_latin1.result:
  Auto merged
mysql-test/t/ctype_latin1.test:
  Auto merged

into  mysql.com:/usr/home/bar/mysql-4.1.b13751

into  mysql.com:/usr/home/bar/mysql-4.1.b13751

into  sanja.is.com.ua:/home/bell/mysql/bk/work-qc-4.1

- fixed test


mysql-test/r/rpl_multi_update2.result:
  fixed setting/reseting environment
  multi-update with subquery added
mysql-test/t/rpl_multi_update2.test:
  fixed setting/reseting environment
  multi-update with subquery added
sql/sql_update.cc:
  set 'updating' in both tables list if we have two of them (because of subquery)

into mysql.com:/space/my/mysql-4.1

support-files/mysql.spec.sh:
  Auto merged

   to assign a potential existing mysql user to the correct user group (BUG#12823) 


support-files/mysql.spec.sh:
   - added a usermod call to assign a potential existing mysql user to the
     correct user group (BUG#12823)

 - added a usermod call to assign a potential existing mysql user to the
   correct user group (BUG#12823)
 - Save the perror binary built during Max build so it supports the NDB
   error codes (BUG#13740)
 - added a separate macro "mysqld_group" to be able to define the
   user group of the mysql user seperately, if desired.


support-files/mysql.spec.sh:
   - added a usermod call to assign a potential existing mysql user to the
     correct user group (BUG#12823)
   - Save the perror binary built during Max build so it supports the NDB
     error codes (BUG#13740)
   - added a separate macro "mysqld_group" to be able to define the
     user group of the mysql user seperately, if desired.

sql/slave.cc:
  Moved mutex_unlock to handle 'err' case properly
vio/vio.c:
  Made code clearer (fcntl_mode is always 0 here)

into deer.(none):/home/hf/work/mysql-4.1.clean

into  mysql.com:/home/my/mysql-4.0

- No need to check *ref when ref is checked (Simple optimization fix)


sql/item.cc:
  No need to check *ref

sql/sql_select.cc:
  Auto merged

mysql-test/r/select.result:
  test result fixed
mysql-test/t/select.test:
  test case added
sql/sql_select.cc:
  do the same for nullable

into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1-tmp

netware/BUILD/mwenv:
  Removed -O3 for Metrowerks compiler.
netware/pack_isam.def:
  NetWare specific change, Added SCRENNAME for pack_isam.
scripts/make_binary_distribution.sh:
  Netware specific change for creating help tables.
strings/my_strtoll10.c:
  Fix for Metrowerks compiler.

into moonbone.local:/work/13535-bug-4.1-mysql


mysql-test/r/select.result:
  Auto merged
mysql-test/t/select.test:
  Auto merged

into mysql.com:/Users/kent/mysql/bk/mysql-4.1

into  mysql.com:/usr/home/bar/mysql-4.1.b12476

strings/ctype-tis620.c:
  memcpy_overlap() replaced with memmove() during the merge.

into  mysql.com:/usr/home/ram/work/mysql-4.1


myisam/mi_search.c:
  Auto merged
include/m_string.h:
  SCCS merged

into  mysql.com:/usr/home/bar/mysql-4.1.b12476


sql/item_cmpfunc.cc:
  Auto merged

into  mysql.com:/home/jimw/my/mysql-4.1-clean

into  mysql.com:/home/jimw/my/mysql-4.1-clean

sql/item.cc:
  Auto merged

  Bug #7672 after merge fix


sql/item.cc:
  Bug #7672 after merge fix
sql/sql_lex.cc:
  Bug #7672 after merge fix
sql/sql_select.cc:
  Bug #7672 after merge fix
mysql-test/t/select.test:
  Bug #7672 after merge fix

into  mysql.com:/home/jimw/my/mysql-4.1-clean

into  mysql.com:/home/jimw/my/mysql-4.1-clean

To force a restart at the end of test, the option file must be non-empty, it's not enough if it exists and is empty.


mysql-test/t/rpl_dual_pos_advance-master.opt:
  the option file must be non-empty (because there's a -z test in mysql-test-run)

into  mysql.com:/home/jimw/my/mysql-4.1-clean


configure.in:
  Auto merged
sql/mysqld.cc:
  Auto merged

into  mysql.com:/home/jimw/my/mysql-4.1-clean


mysql-test/r/cast.result:
  Auto merged
mysql-test/t/cast.test:
  Auto merged
sql/item.h:
  Auto merged

into  mysql.com:/home/jimw/my/mysql-4.1-clean

into moonbone.local:/work/13535-bug-4.1-mysql


mysql-test/r/select.result:
  Auto merged
mysql-test/t/select.test:
  Auto merged

  1. it's wrong to use memcpy() for overlapped areas;
  2. we use it only once.
During merge to 4.1 will remove a memcpy_overlap() call 
from strings/ctype-tis620.c as well in order to fix 
bug #10836: ctype_tis620 test failure with ICC-compiled binaries on IA64.


myisam/mi_search.c:
  use memmove() instead, as memcpy_overlap() is removed.