I am almost sure this is the cause for
BUG#1381 [Opn]: Bug in replication on HP-UX 64 bit binaries?
BUG#1256 [CRp]: Replication slave fails to connect to master in 64-bit version (Solaris)
The reason why I think it's wrong is that the normal client code has 
uint32 ip_addr.
(of course on 32-bit machines it does not matter, but on 64-bit it does).

sql/sql_load.cc:
  small comment

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

"If LOAD DATA INFILE 'small_file' fails on master, slave leaves temp files"
(the bug is in the master)


mysql-test/r/rpl_loaddata.result:
  result update
mysql-test/std_data/rpl_loaddata2.dat:
  change to introduce a unique key violation
mysql-test/t/rpl_loaddata.test:
  testcase for bug#1391.
sql/sql_load.cc:
  fix for bug#1391:
  for a small file, we had in the binlog only the Create_file, not the Delete_file
  (the Create_file was written when the READ_INFO was destroyed).

into mysql.com:/home/dlenev/src/mysql-4.0-bgrn


sql/log_event.cc:
  Auto merged

sql/log_event.cc:
  Now cleaning up only our files during processing of Start_log_event

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

Bug #1392 "On Win, slave leaves one temp file after successf. replicating LOAD DATA INFILE"
Windows-specific bug (we forgot to close a file before deleting it).
Patch written by me, tested by Miguel (thanks!) and it works.


sql/log.cc:
  changed the comment to mean the truth
sql/log_event.cc:
  When you finish replicating LOAD DATA INFILE, close the SQL_LOADxxx.data file
  before deleting it, or Windows will refuse to delete.
  No need to do the same thing for the SQL_LOADxxx.data file, it's not opened
  at this moment.

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

into narttu.mysql.fi:/my/mysql-4.0

(Bugs #770, #1304 and maybe #1295)

BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

scripts/mysql_fix_privilege_tables.sql:
  Merge with 4.1
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

mysys/mf_dirname.c:
  Added comments

into narttu.mysql.fi:/my/mysql-4.0


extra/comp_err.c:
  Auto merged

Added --include and --libs_r options to mysql_config.
Added mysql_get_client_version() to client library
Fixed some minor benchmark issues



acinclude.m4:
  Fixed that 'no' is printed if openssl not used
configure.in:
  Fixed error message
extra/comp_err.c:
  Skip lines before first {
include/mysql.h:
  Indentation cleanup
libmysql/libmysql.c:
  Block SIGPIPE also for not threaded programs.
  This is now done once in mysql_server_init() and not for every call to mysql_init().
  Added mysql_get_client_version()
libmysql/libmysql.def:
  added mysql_get_client_version
scripts/Makefile.am:
  Add openssl libraries to mysql_config
scripts/mysql_config.sh:
  Added options --include and --libs_r
  Added C compiler options to 'cflags'
scripts/mysql_install_db.sh:
  Fixed tests with IN_RPM to not give warnings
sql-bench/bench-init.pl.sh:
  Updated version number
sql-bench/server-cfg.sh:
  Remove duplicate line
sql-bench/test-alter-table.sh:
  Increase loops for more relevant test
sql-bench/test-select.sh:
  Fix wrong test for count_distinct_2
tests/mail_to_db.pl:
  Default db and table for easier usage

into mysql.com:/home/dlenev/src/mysql-4.0-opssl

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

(kind request from the Novell team).
Note that old chmods in rpl_rotate_logs remain.


mysql-test/r/rpl000009.result:
  result update
mysql-test/t/rpl000009.test:
  removing my chmods so that the test can be run on non-Unix platforms.

into mysql.com:/home/dlenev/src/mysql-4.0-bg-1340

client/mysqlbinlog.cc:
  Small fix to avoid double initialization

extra/comp_err.c:
   - fixed typo: "uppdate" -> "update"
heap/hp_test2.c:
   - fixed typo: "uppdate" -> "update"
   - fixed typo: "tryed" -> "tryed"
isam/test2.c:
   - fixed typo: "uppdate" -> "update"
   - fixed typo: "tryed" -> "tryed"
myisam/mi_test2.c:
   - fixed typo: "uppdate" -> "update"
   - fixed typo: "tryed" -> "tryed"

into mysql.com:/home/dlenev/src/mysql-4.0-bg-1340


client/mysqlbinlog.cc:
  Auto merged

into eagle.mysql.r18.ru:/home/vva/work/BUG_1073/mysql-4.0


client/mysqlbinlog.cc:
  Auto merged

Fix for bug #1340 (More careful checks if we met proper Create_file_log_event before Append or Exec event we are processing now)


client/mysqlbinlog.cc:
  More accurate checks if Create_file_log_event is absent for this Append or Exec event...

backticks.

into rhols221.adsl.netsonic.fi:/home/my/bk/mysql-4.0

being read correctly from my.cnf.

optimiser bug patch.


mysql-test/r/distinct.result:
  test results reverted
mysql-test/r/order_by.result:
  test results reverted
sql/sql_select.cc:
  found_constrain renamed to found_constraint
  We don't perform full cartesian product in 
  case when JOIN BUFFER is used: it was taken
  into account.
  s->read_time may contain range index read time,
  so to get full table scan time is necessary to
  call s->table->file->scan_time().

into oak.local:/home/kostja/mysql/mysql-4.0-root

into narttu.mysql.fi:/my/mysql-4.0

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

into oak.local:/home/kostja/mysql/mysql-4.0-rightnow

mysql-test/r/select.result:
  unnecessary info removed from result
mysql-test/t/select.test:
  unnecessary info don't get into result any more

myisam/mi_check.c:
  More explicit error messages
myisam/mi_dynrec.c:
  More comments