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

Build-tools/mysql-copyright-2:
  small fix
Build-tools/mysql-copyright:
  deals with windows src file now

into krsna.patg.net:/home/patg/mysql-4.0


Build-tools/Do-compile:
  Auto merged

VC++Files/examples/udf_example/udf_example.def:
  Add definitions of init and deinit functions

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

into teton.kitebird.com:/home/paul/bk/mysql-4.0

cmp_debug_dtuple_rec_with_match()
unless #ifdef UNIV_DEBUG


innobase/rem/rem0cmp.c:
  Remove cmp_debug_dtuple_rec_with_match() unless #ifdef UNIV_DEBUG

client/mysqltest.c:
  Fix compilation errors for NetWare

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

Portability fix for netware. (We can't use TRY_RUN when cross compiling)

into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.0

  Update README URL. (Bug #3678)


mysql-test/README:
  Update README URL. (Bug #3678)

  Inside LOCK TABLES, use either LOCK_S or LOCK_X in locking reads; an improvent over the previous patch


sql/ha_innodb.cc:
  Inside LOCK TABLES, use either LOCK_S or LOCK_X in locking reads; an improvent over the previous patch
innobase/include/row0mysql.h:
  Inside LOCK TABLES, use either LOCK_S or LOCK_X in locking reads; an improvent over the previous patch
innobase/row/row0mysql.c:
  Inside LOCK TABLES, use either LOCK_S or LOCK_X in locking reads; an improvent over the previous patch

will disable warnings, --log-warnings will increment warning level by one, or the
level can be given as an optional argument. Default level is 1.

Changed aborted connection warning to be logged only if the level is > 1.


sql/sql_class.h:
  Changed boolean into ulong.
sql/sql_parse.cc:
  Changed aborted connection warning to be logged only if the level is > 1.

sql/ha_innodb.cc:
  start_stmt(): Obtain an exclusive lock for other than plain SELECT

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

include/mysql.h:
  (void) added to the empty parameter's list
libmysql/libmysql.c:
  (void) added to the empty parameter's list

Windows

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

into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b3738

(Bug#3738: SQL_CALC_FOUND_ROWS ignores WHERE if LIMIT used,
 Bug#3845: wrong FOUND_ROWS result)

innobase/dict/dict0dict.c:
  Replace tmpfile() with os_file_create_tmpfile()
innobase/include/os0file.h:
  Add os_file_create_tmpfile()
innobase/lock/lock0lock.c:
  Replace tmpfile() with os_file_create_tmpfile()
innobase/os/os0file.c:
  Add os_file_create_tmpfile()
  os_file_handle_error(): remove unused first parameter

Build-tools/Do-compile:
  Added option --config-extra-env
include/my_global.h:
  Cleaned up comment to follow same indentation style as the rest of the code

  Improved a comment about HAVE_BROKEN_PREAD: pread() only works on HP-UX 11.0 if one installs kernel patch PHKL_20349 or greater


include/my_global.h:
  Improved a comment about HAVE_BROKEN_PREAD: pread() only works on HP-UX 11.0 if one installs kernel patch PHKL_20349 or greater

configure.in:
  Ensure that innodb gets system specific CFLAGS and CXXFLAGS
innobase/os/os0file.c:
  Don't use pread/pwrite on systems where these are not working.
  This fixes a bug on HPUX, where InnoDB didn't create the ibdata1 file correctly.

include/config-netware.h:
  Always enable HAVE_COMPRESS on netware
  We can't detect compress in configure on netware because we must use AC_TRY_RUN to detect zlib on other platforms

netware/BUILD/nwbootstrap:
  Patch from Novell, create the libmysqld.imp file.
netware/mysqld_safe.c:
  Patch from Novell, new option --set-variable.

myisam/ft_boolean_search.c:
  perlify comment

use opt_net_buffer_length instead of net_buffer_length


Makefile.am:
  netware files should always be in 'make dist'
client/mysqldump.c:
  use opt_net_buffer_length instead of net_buffer_length
configure.in:
  netware files should always be in 'make dist'
netware/Makefile.am:
  netware files should always be in 'make dist'

VC++Files/client/mysqlclient.dsp:
  Added missing /D MYSQL_CLIENT
VC++Files/innobase/innobase.dsp:
  Remove not existing file
sql/mysqld.cc:
  Fixed comment

when UNIV_DEBUG is defined (introduced in ChangeSet@1.1850)


innobase/que/que0que.c:
  Remove ut_ad() reference to removed parameter next_thr

VC++Files/innobase/innobase.dsp:
  non-existent file removed
client/mysql.cc:
  local opt_max_allowed_packet and opt_net_buffer_length introduced
client/mysqldump.c:
  local opt_max_allowed_packet and opt_net_buffer_length introduced
include/mysql.h:
  mysql_get_parameters() interface added
  #define max_allowed_packet added
include/mysql_com.h:
  these should not be exported
libmysql/libmysql.c:
  mysql_get_parameters implementations
libmysql/libmysql.def:
  interface changed
libmysql_r/Makefile.am:
  MYSQL_CLIENT define added
libmysqld/lib_sql.cc:
  line moved to be above the '#include "mysql.cc"'
libmysqld/libmysqld.c:
  mysql_get_parameters implementation (embedded)
libmysqld/libmysqld.def:
  interface changed
sql/log_event.cc:
  should be like that in this case
tools/mysqlmanager.c:
  compiler warns on this line

innobase/include/log0log.h:
  Remove references to online backup
innobase/include/log0log.ic:
  Remove references to online backup
innobase/include/mtr0mtr.h:
  Remove references to MLOG_FULL_PAGE
innobase/log/log0log.c:
  Remove references to online backup
innobase/log/log0recv.c:
  Remove references to MLOG_FULL_PAGE
innobase/mtr/mtr0mtr.c:
  Remove references to MLOG_FULL_PAGE
  Remove references to online backup