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

into mysql.com:/tmp/skr99/mysql-4.0

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

configurations added to build the libraries with USE_TLS flag to be
used for libmysqld


VC++Files/dbug/dbug.dsp:
  TLS_DEBUG configuration added
VC++Files/heap/heap.dsp:
  TLS and TLS_DEBUG configurations added
VC++Files/isam/isam.dsp:
  TLS and TLS_DEBUG configurations added
VC++Files/libmysql/libmysql.dsp:
  MYSQL_CLIENT define enabled
VC++Files/libmysqld/libmysqld.dsp:
  using of _tls libraries added
VC++Files/myisam/myisam.dsp:
  TLS and TLS_DEBUG configurations added
VC++Files/myisammrg/myisammrg.dsp:
  TLS and TLS_DEBUG configurations added
VC++Files/mysys/mysys.dsp:
  TLS and TLS_DEBUG configurations added
include/mysql_com.h:
  __declspec(dllimport) seems to be necessary when one uses .dll
  on Windows

into mysql.com:/tmp/skr99/mysql-4.0


client/mysqltest.c:
  Auto merged
configure.in:
  Auto merged
include/my_global.h:
  Auto merged
myisam/myisam_ftdump.c:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/mysqld.cc:
  Auto merged

Build-tools/Do-compile:
  Fixed indentation
configure.in:
  Added patches from Novell
  Added C_EXTRA_FLAGS as an easy way to pass flags to both CFLAGS and CXXFLAGS
extra/perror.c:
  Fixed error number reporting to not report 'Unknown error'
include/my_global.h:
  Defines to make NETWARE patches cleaner
include/thr_alarm.h:
  Fixed wrong macro
netware/mysql_install_db.c:
  Indentation fix

BitKeeper/deleted/.del-srv0que.c~d1feebb77b5a9b96:
  Delete: innobase/srv/srv0que.c
innobase/srv/Makefile.am:
  Remove srv0que.c
BitKeeper/deleted/.del-srv0que.h~f12ecb4b5afe203e:
  Delete: innobase/include/srv0que.h
innobase/include/Makefile.am:
  Remove srv0que.c
innobase/include/que0que.h:
  Remove unnecessary function que_fork_error_handle()
  que_thr_end_wait(): Remove output parameter next_thr; return it
innobase/include/trx0roll.h:
  trx_rollback(), trx_finish_rollback_off_kernel():
  Remove output parameter next_thr; return it instead
innobase/include/trx0trx.h:
  trx_sig_send(), trx_sig_reply(), trx_sig_start_handle():
  Remove output parameter next_thr; return it instead
innobase/include/usr0sess.h:
  Remove sess->state and its literals SESS_ACTIVE and SESS_ERROR
innobase/que/que0que.c:
  Remove unnecessary function que_fork_error_handle()
  que_thr_end_wait(): Remove output parameter next_thr; return it
  Remove references to srv0que.c
innobase/srv/srv0srv.c:
  Remove unnecessary #include "srv0que.h"
innobase/trx/trx0purge.c:
  Remove unneeded references to srv0que.c
innobase/trx/trx0roll.c:
  Many functions: Remove output parameter next_thr; return it instead
  Remove references to srv0que.c
innobase/trx/trx0trx.c:
  Many functions: Remove output parameter next_thr; return it instead
  Remove references to srv0que.c
  Remove references to SESS_ERROR
innobase/usr/usr0sess.c:
  Remove sess->state

VC++Files/copy_mysql_files.bat:
  Added /Y to avoid questions
  Fixed wrong path for copying data files
VC++Files/sql/mysqld.dsp:
  Added missing compiler option

VC++Files/mysqldemb/mysqldemb.dsp:
  Removed references to BDB and InnoDB from 'classic'
VC++Files/sql/mysqld.dsp:
  Removed references to BDB and InnoDB from 'classic'

Update of VC++ project files.


VC++Files/mysqlmanager/childfrm.cpp:
  Rename: VC++Files/mysqlmanager/CHILDFRM.CPP -> VC++Files/mysqlmanager/childfrm.cpp
VC++Files/mysqlmanager/childfrm.h:
  Rename: VC++Files/mysqlmanager/CHILDFRM.H -> VC++Files/mysqlmanager/childfrm.h
VC++Files/mysqlmanager/mainfrm.cpp:
  Rename: VC++Files/mysqlmanager/MAINFRM.CPP -> VC++Files/mysqlmanager/mainfrm.cpp
VC++Files/mysqlmanager/mainfrm.h:
  Rename: VC++Files/mysqlmanager/MAINFRM.H -> VC++Files/mysqlmanager/mainfrm.h
VC++Files/mysqlmanager/mysqlmanager.dsp:
  Rename: VC++Files/mysqlmanager/MySqlManager.dsp -> VC++Files/mysqlmanager/mysqlmanager.dsp
VC++Files/mysqlmanager/mysqlmanager.mak:
  Rename: VC++Files/mysqlmanager/MySqlManager.mak -> VC++Files/mysqlmanager/mysqlmanager.mak
VC++Files/mysqlmanager/resource.h:
  Rename: VC++Files/mysqlmanager/RESOURCE.H -> VC++Files/mysqlmanager/resource.h
VC++Files/mysqlmanager/stdafx.cpp:
  Rename: VC++Files/mysqlmanager/STDAFX.CPP -> VC++Files/mysqlmanager/stdafx.cpp
VC++Files/mysqlmanager/stdafx.h:
  Rename: VC++Files/mysqlmanager/STDAFX.H -> VC++Files/mysqlmanager/stdafx.h
VC++Files/mysqlmanager/toolsql.cpp:
  Rename: VC++Files/mysqlmanager/TOOLSQL.CPP -> VC++Files/mysqlmanager/toolsql.cpp
VC++Files/mysqlmanager/toolsql.h:
  Rename: VC++Files/mysqlmanager/TOOLSQL.H -> VC++Files/mysqlmanager/toolsql.h
VC++Files/mysqlmanager/RES/bitmap1.bmp:
  Rename: VC++Files/mysqlmanager/RES/BITMAP1.BMP -> VC++Files/mysqlmanager/RES/bitmap1.bmp
VC++Files/mysqlmanager/RES/bitmap3.bmp:
  Rename: VC++Files/mysqlmanager/RES/BITMAP3.BMP -> VC++Files/mysqlmanager/RES/bitmap3.bmp
VC++Files/mysqlmanager/RES/bmp00001.bmp:
  Rename: VC++Files/mysqlmanager/RES/BMP00001.BMP -> VC++Files/mysqlmanager/RES/bmp00001.bmp
VC++Files/mysqlmanager/RES/bmp00002.bmp:
  Rename: VC++Files/mysqlmanager/RES/BMP00002.BMP -> VC++Files/mysqlmanager/RES/bmp00002.bmp
VC++Files/mysqlmanager/RES/database.bmp:
  Rename: VC++Files/mysqlmanager/RES/DATABASE.BMP -> VC++Files/mysqlmanager/RES/database.bmp
VC++Files/mysqlmanager/RES/fontd.bmp:
  Rename: VC++Files/mysqlmanager/RES/FONTD.BMP -> VC++Files/mysqlmanager/RES/fontd.bmp
VC++Files/mysqlmanager/RES/fontu.bmp:
  Rename: VC++Files/mysqlmanager/RES/FONTU.BMP -> VC++Files/mysqlmanager/RES/fontu.bmp
VC++Files/mysqlmanager/RES/query_ex.bmp:
  Rename: VC++Files/mysqlmanager/RES/QUERY_EX.BMP -> VC++Files/mysqlmanager/RES/query_ex.bmp
VC++Files/mysqlmanager/RES/toolbar.bmp:
  Rename: VC++Files/mysqlmanager/RES/TOOLBAR.BMP -> VC++Files/mysqlmanager/RES/toolbar.bmp
BUILD/compile-pentium-valgrind-max:
  Use MYSQL_SERVER_SUFFIX
VC++Files/bdb/bdb.dsp:
  Use new version of MYSQL_SERVER_SUFFIX
VC++Files/client/mysql.dsp:
  Use new version of MYSQL_SERVER_SUFFIX
VC++Files/client/mysqladmin.dsp:
  Use new version of MYSQL_SERVER_SUFFIX
VC++Files/client/mysqldump.dsp:
  Use new version of MYSQL_SERVER_SUFFIX
VC++Files/client/mysqlimport.dsp:
  Use new version of MYSQL_SERVER_SUFFIX
VC++Files/client/mysqlshow.dsp:
  Use new version of MYSQL_SERVER_SUFFIX
VC++Files/copy_mysql_files.bat:
  Assume we are in correct directory
VC++Files/innobase/innobase.dsp:
  Use new version of MYSQL_SERVER_SUFFIX
  Remove old files
VC++Files/isamchk/isamchk.dsp:
  Use new version of MYSQL_SERVER_SUFFIX
VC++Files/libmysqld/libmysqld.dsp:
  Use new version of MYSQL_SERVER_SUFFIX
VC++Files/my_print_defaults/my_print_defaults.dsp:
  Use new version of MYSQL_SERVER_SUFFIX
VC++Files/myisamchk/myisamchk.dsp:
  Use new version of MYSQL_SERVER_SUFFIX
VC++Files/myisamlog/myisamlog.dsp:
  Use new version of MYSQL_SERVER_SUFFIX
VC++Files/myisampack/myisampack.dsp:
  Use new version of MYSQL_SERVER_SUFFIX
VC++Files/mysql.dsw:
  Use new version of MYSQL_SERVER_SUFFIX
VC++Files/mysqlbinlog/mysqlbinlog.dsp:
  Use new version of MYSQL_SERVER_SUFFIX
VC++Files/mysqlcheck/mysqlcheck.dsp:
  Use new version of MYSQL_SERVER_SUFFIX
VC++Files/mysys/mysys.dsp:
  Use new version of MYSQL_SERVER_SUFFIX
VC++Files/pack_isam/pack_isam.dsp:
  Use new version of MYSQL_SERVER_SUFFIX
VC++Files/perror/perror.dsp:
  Use new version of MYSQL_SERVER_SUFFIX
VC++Files/replace/replace.dsp:
  Use new version of MYSQL_SERVER_SUFFIX
VC++Files/sql/mysqld.dsp:
  Use new version of MYSQL_SERVER_SUFFIX
include/my_global.h:
  Added QUOTE and STRINGIFY
include/mysql_version.h.in:
  New MYSQL_SERVER_SUFFIX handling
innobase/eval/eval0eval.c:
  Fixed compiler warning
libmysql/libmysql.c:
  Use STRINGIFY()
sql/mysqld.cc:
  New MYSQL_SERVER_SUFFIX handling
sql/mysqld_suffix.h:
  New MYSQL_SERVER_SUFFIX handling
sql/set_var.cc:
  Use STRINGIFY()
zlib/contrib/asm386/zlibvc.dsp:
  Updated for 4.0

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

so we set SQL_BIG_SELECTS to 1.


sql/slave.cc:
  The slave SQL thread must always have SQL_BIG_SELECTS=1, so that it does not fail to replicate an INSERT SELECT
  examining more than 4 billion rows (for client threads, SQL_BIG_SELECTS is automatically set to 1 if
  max_join_size is 4G, but that's in handle_one_connection, so not for the slave thread).

innobase/sync/sync0arr.c:
  sync_array_cell_print(): Remove unused variable str

Use %windir% instead of c:\winnt\ (Bug #3786)
Fixed wrong foreign key test in crash-me (Bug #3740)


VC++Files/libmysql/libmysql.dsp:
  Use %windir% instead of c:\winnt\ (Bug #3786)
sql-bench/crash-me.sh:
  Fixed wrong foreign key test (Bug #3740)
sql-bench/limits/mysql.cfg:
  Updated results

into mysql.com:/dbdata/psergey/mysql-4.0-root

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


sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged

Ensured that all projects compile
Removed compiler warnings
Better setting of server_version variable.
Fix that make_win_src_distribution creates the privilege tables.


VC++Files/bdb/bdb.dsp:
  Small, automatic changes
VC++Files/client/mysql.dsp:
  Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/client/mysqladmin.dsp:
  Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/client/mysqlclient.dsp:
  Removed files that should only be used with mysql command line client
VC++Files/client/mysqldump.dsp:
  Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/client/mysqlimport.dsp:
  Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/client/mysqlshow.dsp:
  Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/comp_err/comp_err.dsp:
  Automatic changes
VC++Files/dbug/dbug.dsp:
  Automatic changes
VC++Files/heap/heap.dsp:
  automatic changes
VC++Files/innobase/innobase.dsp:
  Automatic changes
VC++Files/isam/isam.dsp:
  Automatic changes
VC++Files/isamchk/isamchk.dsp:
  Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/libmysql/libmysql.dsp:
  Automatic changes
VC++Files/libmysqld/examples/test_libmysqld.dsp:
  Add missing files
VC++Files/libmysqld/libmysqld.dsp:
  Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/libmysqltest/myTest.dsp:
  Automatic changes
VC++Files/merge/merge.dsp:
  Automatic changes
VC++Files/my_print_defaults/my_print_defaults.dsp:
  Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/myisam/myisam.dsp:
  automatic changes
VC++Files/myisam_ftdump/myisam_ftdump.dsp:
  automatic changes
VC++Files/myisamchk/myisamchk.dsp:
  Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/myisamlog/myisamlog.dsp:
  Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/myisammrg/myisammrg.dsp:
  Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/myisampack/myisampack.dsp:
  Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/mysql.dsw:
  Automatic changes
VC++Files/mysqlbinlog/mysqlbinlog.dsp:
  Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/mysqlcheck/mysqlcheck.dsp:
  Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/mysqldemb/mysqldemb.dsp:
  Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/mysqlserver/mysqlserver.dsp:
  Automatic changes
VC++Files/mysqlshutdown/mysqlshutdown.dsp:
  Automatic changes
VC++Files/mysqlwatch/mysqlwatch.dsp:
  Automatic changes
VC++Files/mysys/mysys.dsp:
  Automatic changes
VC++Files/pack_isam/pack_isam.dsp:
  Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/perror/perror.dsp:
  Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/regex/regex.dsp:
  Automatic changes
VC++Files/replace/replace.dsp:
  Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/sql/mysqld.dsp:
  Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/strings/strings.dsp:
  Removed duplicate code for strnlen
VC++Files/test1/test1.dsp:
  Automatic changes
VC++Files/thr_test/thr_test.dsp:
  Automatic changes
VC++Files/vio/vio.dsp:
  Automatic changes
VC++Files/zlib/contrib/asm386/zlibvc.dsp:
  Automatic changes
VC++Files/zlib/zlib.dsp:
  Automatic changes
extra/my_print_defaults.c:
  Fixed bug in --verbose
include/m_string.h:
  Portability fix
include/mysql_embed.h:
  Better setting of server_version variable
include/mysql_version.h.in:
  Better license text handling
innobase/pars/pars0lex.l:
  Remove compiler warnings
innobase/trx/trx0sys.c:
  Remove compiler warnings
libmysqld/lib_sql.cc:
  Better setting of server_version variable
libmysqld/libmysqld.def:
  Add functions needed for mysql command line client
myisam/myisam_ftdump.c:
  Remove compiler warnings
mysys/sha1.c:
  Remove compiler warnings
scripts/make_win_src_distribution.sh:
  Safety fix
scripts/mysql_install_db.sh:
  Backport from 4.1 to allow make_win_src_distribution create the privilege tables
sql/Makefile.am:
  Add new file mysqld_suffix.h
  Remove not used file sql_olap.h
sql/ha_innodb.cc:
  Remove not used variable
sql/mysqld.cc:
  Better setting of server_version variable
sql/set_var.cc:
  Fixed bug when showing lower_case_file_system
strings/ctype-tis620.c:
  Remove compiler warnings

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


sql/set_var.cc:
  Auto merged

(fix by our Harrison Fisk): when one does SET GLOBAL SERVER_ID=x, we must set
server_id_supplied to 1.


sql/mysql_priv.h:
  server_id_supplied must be here to be visible in set_var.cc
sql/mysqld.cc:
  rephrasing warnings when server id is not set explicitely.
sql/set_var.cc:
  when one does SET GLOBAL SERVER_ID=x; it should be considered as explicitely setting
  the server id, so do server_id_supplied=1.
sql/slave.cc:
  Correcting wrong comment

work as expected": precision-losing conversion removed from 
sys_var_thd_ulonglong.


mysql-test/r/variables.result:
  Test case for Bug#3754
mysql-test/t/variables.test:
  Test case for Bug#3754
sql/set_var.cc:
  Fix for Bug#3754: precision-losing conversion removed from 
  sys_var_thd_ulonglong.

sql/sql_class.h:
  Fix for BUG33649: Post-review fixes: added RNEXT_SAME
sql/sql_handler.cc:
  Fix for BUG33649: Post-review fixes: added RNEXT_SAME

mysql-test/r/handler.result:
  Test case for BUG#3649
mysql-test/t/handler.test:
  Test case for BUG#3649
sql/sql_handler.cc:
  Fix for BUG#3649: when doing an index scan for an equality condition, use index_next_same to retrieve subsequent rows.

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

  Fix a memory corruption bug: in 32-bit computers, every 4 billionth malloc outside innodb_additional_mem_pool_size was mistreated when freeing the memory; this could corrupt the InnoDB additional mem pool and could have caused crashes anywhere, also inside MySQL, or even database corruption! the bug exists also in 3.23 and 4.1; workaround: configure innodb_additional_mem_pool_size big enough


innobase/mem/mem0pool.c:
  Fix a memory corruption bug: in 32-bit computers, every 4 billionth malloc outside innodb_additional_mem_pool_size was mistreated when freeing the memory; this could corrupt the InnoDB additional mem pool and could have caused crashes anywhere, also inside MySQL, or even database corruption! the bug exists also in 3.23 and 4.1; workaround: configure innodb_additional_mem_pool_size big enough

  Allocate the table name buffer from the mem heap of a foreign key object rather than pointing to the name buffer in the table object; even though this apparently caused no bugs in RENAME, DROP, ALTER TABLE, or elsewhere, this convention was very prone to memory allocation bugs


innobase/dict/dict0dict.c:
  Allocate the table name buffer from the mem heap of a foreign key object rather than pointing to the name buffer in the table object; even though this apparently caused no bugs in RENAME, DROP, ALTER TABLE, or elsewhere, this convention was very prone to memory allocation bugs

innobase/srv/srv0srv.c:
  Remove reference to sync0ipm.h