into  mysql.com:/usr/local/home/marty/MySQL/mysql-4.1

include/my_global.h:
  Fix for gcc 4.0 (they removed min/max)

  Identation fix


sql/field_conv.cc:
  Identation fix

  Bug#11591
  CHAR column with utf8 does not work properly
  (more chars than expected)
  do_cut_string didn't call well_formed_length,
  and copied all data, which was wrong in the
  case of multibyte character set.
ctype_utf8.result, ctype_utf8.test:
  adding test case


sql/field_conv.cc:
  Bug#11591
  CHAR column with utf8 does not work properly
  (more chars than expected)
  do_cut_string didn't call well_formed_length,
  and copied all data, which was wrong in the
  case of multibyte character set.
mysql-test/t/ctype_utf8.test:
  adding test case
mysql-test/r/ctype_utf8.result:
  adding test caser

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

  at all)

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

  Corrected libs and lib search path for debug target


VC++Files/tests/mysql_client_test.dsp:
  Corrected libs and lib search path for debug target

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

mysql-test/Makefile.am:
  - added mysql-test/t/*.def to the source distribution and make sure that "make install"
    installs it, too.
scripts/make_binary_distribution.sh:
  - added mysql-test/t/*.def to the binary distribution

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

  Added support for the disabled.def file


mysql-test/lib/mtr_cases.pl:
  Added support for the disabled.def file

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

  - Change output from SHOW CREATE TABLE to use USING instead of TYPE


mysql-test/r/ctype_utf8.result:
  Update test results
mysql-test/r/show_check.result:
  Update test results
mysql-test/r/sql_mode.result:
  Update test results
mysql-test/t/show_check.test:
  Add test for BUG#11635
sql/sql_show.cc:
  Change TYPE to USING as output from SHOW CREATE TABLE

into  zim.(none):/home/brian/mysql/mysql-4.1


BitKeeper/etc/config:
  Auto merged

vio/viossl.c:
  Typo for dbug code
BitKeeper/etc/config:
  turned off openlogging

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

  Corrected appending of .exe to Windows executables
  Don't alter read only @_ in foreach loop
mysql-test-run.pl:
  Improved cleanup of binlogs
  Use separate log file for second master
  Corrected Windows paths to executables


mysql-test/mysql-test-run.pl:
  Improved cleanup of binlogs
  Use separate log file for second master
  Corrected Windows paths to executables
mysql-test/lib/mtr_misc.pl:
  Corrected appending of .exe to Windows executables
  Don't alter read only @_ in foreach loop

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

  Handle case where SHELL isn't set in Cygwin
mysql_client_test.dsp:
  Put output into the "client_debug" and "client_release" directories


VC++Files/tests/mysql_client_test.dsp:
  Put output into the "client_debug" and "client_release" directories
mysql-test/mysql-test-run.pl:
  Handle case where SHELL isn't set in Cygwin

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

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

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

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


scripts/make_binary_distribution.sh:
  Auto merged

  all versions: added an option "--machine" that allows to override the autodetected
  architecture string (e.g. "i386") that becomes part of the binary package name with 
  a different one
- moved the removal of the BASE directory to the end of the make_binary_distribution
  script


scripts/make_binary_distribution.sh:
  - backported and fixed a change from 5.0 for easier building of all versions: added an
    option "--machine" that allows to override the autodetected architecture string 
    (e.g. "i386") that becomes part of the binary package name with a different one
  - moved the removal of the BASE directory to the end of the script

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

into  mysql.com:/usr/local/home/marty/MySQL/mysql-4.1

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

include/my_global.h:
  a fix (bug #11544: Use of missing rint() function on QNX).
  We have to explicitly specify std:: namespace to use 
  rint() and isnan() functions in C++ scope on QNX due 
  to an error in the /usr/include/math.h

mysql-test/r/func_str.result:
  SCCS merged
mysql-test/t/func_str.test:
  SCCS merged

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

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

mysql-test/r/query_cache.result:
  Remove stray empty line
mysql-test/r/grant.result:
  Update results
mysql-test/t/grant.test:
  Fix test case to

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

  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir


client/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
cmd-line-utils/libedit/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
dbug/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
extra/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
heap/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
isam/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
libmysql/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
libmysql_r/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
libmysqld/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
libmysqld/examples/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
merge/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
myisam/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
myisammrg/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
mysql-test/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
mysys/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
netware/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
regex/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
sql/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
strings/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
tests/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
vio/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
tools/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir

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

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


sql/sql_table.cc:
  Auto merged

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