into mysql.com:/home/mydev/mysql-4.1-wl1687

into mysql.com:/home/mydev/mysql-4.1-wl1687

into serg.mylan:/usr/home/serg/Abk/mysql-4.1

innobase/include/ut0mem.h:
  Remove ut_strdup(), as it is a clone of mem_strdup()
innobase/os/os0file.c:
  Replace ut_strdup() with mem_strdup()
innobase/ut/ut0mem.c:
  Remove ut_strdup(), as it is a clone of mem_strdup()

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

strings/dump_map.c:
  Produce better formatted dump.

into mysql.com:/home/mydev/mysql-4.1-wl1687

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

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

   /Library/StartupItems/MySQL to /Library/StartupItems/MySQLCOM
   to avoid a name space collision with the MySQL Startup Item shipped
   with Mac OS X Server, updated the MySQLStartupItem PKG version
   number to reflect the change.


Build-tools/Do-pkg:
   - Renamed the StartupItem directory from /Library/StartupItems/MySQL
     to /Library/StartupItems/MySQLCOM to avoid a name space collision
     with the MySQL Startup Item in Mac OS X Server
support-files/MacOSX/StartupItem.Description.plist:
   - Bumped up the StartupItem Package version to 1.1 to indicate the
     change in directory naming

into serg.mylan:/usr/home/serg/Abk/mysql-4.1


client/mysqldump.c:
  Auto merged

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

Remove wrong redefine of vio_reset() (to compile libmysqld on windows)


include/violite.h:
  Remove wrong redefine of vio_reset()
support-files/my-huge.cnf.sh:
  Add read_rnd_buffer_size
support-files/my-large.cnf.sh:
  Add read_rnd_buffer_size
support-files/my-medium.cnf.sh:
  Add read_rnd_buffer_size
support-files/my-small.cnf.sh:
  Add read_rnd_buffer_size

into mc05.(none):/space/tomas/mysql-4.1

  slim make for ndb


ndb/Makefile:
  slim make for ndb

into hundin.mysql.fi:/home/marko/j/mysql-4.1

into hundin.mysql.fi:/home/marko/j/mysql-4.1


sql/sql_table.cc:
  Auto merged

to allow binding of userland functions in PHP.


include/mysql.h:
  added new last parameter (void *) for mysql_set_local_infile_handler
  st_mysql_options:
    added void *local_infile_userdata
    added last parameter (void *) for local_infile_init function pointer
libmysql/libmysql.c:
  added parameter userdata in mysql_set_local_infile_handler
  added parameter (void *userdata __attribute__ ((unused))) in mysql_local_infile_init
  passed additional parameter userdata to init function in handle_local_infile
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

into hundin.mysql.fi:/home/marko/j/mysql-4.1


sql/sql_table.cc:
  Auto merged

into mysql.com:/home/mydev/mysql-4.1-wl1687


sql/handler.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged

  Czech collations were renamed to _cs
Index.xml:
  Czech collation were renamed to _cs


sql/share/charsets/Index.xml:
  Czech collation were renamed to _cs
strings/ctype-czech.c:
  Czech collations were renamed to _cs
strings/ctype-win1250ch.c:
  Czech collations were renamed to _cs

Portablity fix for system with case insenstive table names. (Without this ALTER TABLE can fail for InnoDB)

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


libmysql/libmysql.c:
  Auto merged

Change strtoll -> my_strtoll10()
Fixed bug in my_strntoul() and my_strntol() where we got different values on 32 and 64 bit systems (Bug #3472)


configure.in:
  Fixed problem on IRIX64 (One can't have AC_MSG_RESULT on same row as AC_DEFINE
extra/my_print_defaults.c:
  Fixed wrong definition for 'verbose'
include/my_global.h:
  Portability fix (IRIX64)
libmysql/client_settings.h:
  Remove compiler warnings
libmysql/libmysql.c:
  Remove compiler warnings
mysql-test/r/func_str.result:
  Updated results
mysql-test/r/key_cache.result:
  Updated results to not depend on key_blocks_unused
mysql-test/t/func_str.test:
  More test of long overflow
mysql-test/t/key_cache.test:
  Updated results to not depend on key_blocks_unused
sql/item.cc:
  Portability fix (don't use strtoll())
sql/item.h:
  Portability fix (don't use strtoll())
sql/item_sum.h:
  Portability fix (don't use strtoll())
sql/item_timefunc.cc:
  Fixed compiler warning
strings/ctype-simple.c:
  Fixed bug in my_strntoul() and my_strntol() where we got different values on 32 and 64 bit systems
strings/ctype-ucs2.c:
  Fixed bug in my_strntoul() and my_strntol() where we got different values on 32 and 64 bit systems

into hegel.local:/home/miguel/bk/mysql-4.1

sql/set_var.cc:
  VC++ error compiler compatibility

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

sql/sql_lex.h:
  description of field
sql/sql_union.cc:
  layout fixed

item_list for fake_select will be created only once
(problem reported by valgrind in test_union2 fixed)


sql/sql_lex.h:
  new function to keep code in one place
sql/sql_union.cc:
  fake_select_lex should be prepared during PS preparation to work correctly
  item_list for fake_select will be created only once

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

   that was accidently added by the last BK auto merge


VC++Files/client/mysqlclient.dsp:
   - removed duplicate file ..\strings\strxnmov.c that was added by the
     last auto merge

client/mysqldump.c:
  help text corrected

libmysql/libmysql.c:
  Make advanced_command check client reply
sql/sql_prepare.cc:
  mysql_stmt_reset now sends ok/error reply to the client.
tests/client_test.c:
  Memory leak fixed.