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

into mishka.mysql.fi:/home/my/mysql-3.23


sql/sql_repl.cc:
  Auto merged

mysql-test/t/myisam.test:
  Cleanup test
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

into eagle.mysql.r18.ru:/home/vva/work/BUG_1378/mysql-3.23

sql/sql_repl.cc:
  fixed mysql_binlog_send to use COM_BINLOG_DUMP in mysqlbinlog

The 4.0 changeset was:
ChangeSet@1.1579.3.1, 2003-09-26 23:43:22+02:00, guilhem@mysql.com
  Fix for 64-bit machines.
  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/mini_client.cc:
  backport of a fix made in 4.0 to make replication work in 64-bit binaries.

 - Tagged ChangeSet 1.1413 as "mysql-3.23.58"


configure.in:
   - Bumped up version number from 3.23.58 to 3.23.59 in configure.in

VC++Files/InstallShield/3.23.XX-com/Component Definitions/.fgl:
  mvdir
VC++Files/InstallShield/3.23.XX-com/Component Definitions/Default.cdf:
  mvdir
VC++Files/InstallShield/3.23.XX-com/Component Definitions/Default.fgl:
  mvdir
VC++Files/InstallShield/3.23.XX-com/File Groups/Clients and Tools.fgl:
  mvdir
VC++Files/InstallShield/3.23.XX-com/File Groups/Default.fdf:
  mvdir
VC++Files/InstallShield/3.23.XX-com/File Groups/Default.fgl:
  mvdir
VC++Files/InstallShield/3.23.XX-com/File Groups/Development.fgl:
  mvdir
VC++Files/InstallShield/3.23.XX-com/File Groups/Documentation.fgl:
  mvdir
VC++Files/InstallShield/3.23.XX-com/File Groups/Grant Tables.fgl:
  mvdir
VC++Files/InstallShield/3.23.XX-com/File Groups/Servers.fgl:
  mvdir
VC++Files/InstallShield/3.23.XX-com/MySQL 3.23.com.ipr:
  mvdir
VC++Files/InstallShield/3.23.XX-com/Registry Entries/Default.rge:
  mvdir
VC++Files/InstallShield/3.23.XX-com/Script Files/Setup.dbg:
  mvdir
VC++Files/InstallShield/3.23.XX-com/Script Files/Setup.ino:
  mvdir
VC++Files/InstallShield/3.23.XX-com/Script Files/Setup.ins:
  mvdir
VC++Files/InstallShield/3.23.XX-com/Script Files/Setup.obs:
  mvdir
VC++Files/InstallShield/3.23.XX-com/Script Files/Setup.rul:
  mvdir
VC++Files/InstallShield/3.23.XX-com/Setup Files/Uncompressed Files/Language Independent/OS Independent/SETUP.BMP:
  mvdir
VC++Files/InstallShield/3.23.XX-com/Shell Objects/Default.shl:
  mvdir
VC++Files/InstallShield/3.23.XX-com/String Tables/Default.shl:
  mvdir
VC++Files/InstallShield/3.23.XX-com/Text Substitutions/Build.tsb:
  mvdir
VC++Files/InstallShield/3.23.XX-com/Text Substitutions/Setup.tsb:
  mvdir
VC++Files/InstallShield/3.23.XX-com/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt:
  Add version placeholders for automation
VC++Files/InstallShield/3.23.XX-com/String Tables/0009-English/value.shl:
  Add version placeholders for automation
VC++Files/InstallShield/3.23.XX-gpl/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt:
  Add version placeholders for automation
VC++Files/InstallShield/3.23.XX-gpl/String Tables/0009-English/value.shl:
  Add version placeholders for automation
scripts/Makefile.am:
  Build make_win_src_distribution script by default
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

DO NOT COPY THIS CODE TO 4.0. The bugfix is better in 4.0,
but here in 3.23 we don't want to add a new error code so
we just use ER_EMPTY_QUERY. Bug was:
"If a query was ignored on the slave (because of
@code{replicate-ignore-table} and other similar rules), the slave
still checked if the query got the same error code (0, no error) as on
the master. So if the master had an error on the query (for example,
``Duplicate entry'' in a multiple-row insert), then the slave stopped
and warned that the error codes didn't match. (Bug #797)"


sql/slave.cc:
  Ignore ER_EMPTY_QUERY as it is also a marker for "query was ignored because 
  of replicate-*-table rules".
sql/sql_parse.cc:
  In a slave thread, mark an ignored query (because of replicate-*-table rules)
  as empty. The caller, exec_event(), will understand this error code as "ignorable
  query, don't compare the error codes on master and slave".

   to be able to compile on HP-UX 10.20 (which does not have in_add_t).


extra/resolveip.c:
   - backport compatibility fix from 4.0 to be able to compile on HP-UX 10.20
     (which does not have in_add_t).

client/mysqldump.c:
  Better quoting patch

proper obligatory quoting of identifiers in mysqldump<->server communication (unrelated from command-line options)

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

mysql-test/r/isam.result:
  Updated test for overflow bug
mysql-test/t/isam.test:
  Updated test for overflow bug

isam/open.c:
  Fixed overflow bug when using packed tables and blobs
isam/test_all.res:
  updated test results
myisam/mi_dynrec.c:
  pack_bits not needed here as we do it on open
myisam/mi_open.c:
  Fixed overflow bug when using packed tables and blobs

sql/item.h:
  fixups
sql/sql_show.cc:
  avoid allocations for simple tables
  old client compatibility

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

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

That's to make resolveip work on our FreeBSD-5.0/Sparc64 build host.


extra/resolveip.c:
  Fix for 64-bit CPUs (u_long is 64 bit there, but in_addr_t is always uint32).

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

sql/sql_select.cc:
  Fix the GCC compiler error introduced for the cast for VC++

the bug with 3.23.
ChangeSet@1.1416.113.1, 2003-03-22 15:22:59+01:00, guilhem@mysql.com
  Fix for #178  Replicating INSERT VALUES(USER()) crashes (SEGV) the slave
      Now it does not SEGV, but USER() is still badly replicated
      (it is replicated to ""), which is a lower priority bug.


sql/item_strfunc.cc:
  Don't segfault in USER() if thd->user == 0 (system thread).

  Backport from 4.0 of the btr0sea.c latch hang fix


sql/ha_innobase.cc:
  Backport from 4.0 of the btr0sea.c latch hang fix

into mashka.mysql.fi:/home/my/mysql-3.23

was used with NULL value on NOT NULL column. (Bug #479)


mysql-test/r/order_by.result:
  Update of results
mysql-test/t/order_by.test:
  Test of new code
sql/sql_select.cc:
  Fixed problem with lookup on NULL

into eagle.mysql.r18.ru:/home/vva/work/BUG_479_/mysql-3.23


BitKeeper/etc/logging_ok:
  auto-union

mysql-test/r/user_var.result:
  added tests for user variables comparing (bug #551)
mysql-test/t/user_var.test:
  added tests for user variables comparing (bug #551)
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

repository (incredible that I forgot to push, but why not).
So unfortunately the bugfix missed 3.23.57 and will be in .58 :(
Instead of looking like working (bug #198), replication between
a 3.23 slave and 4.0 master should frankly stop. Here we detect
4.0 masters in the 3.23 slave code when we see a strange Rotate
event, and in that case we print an error and stop.
4.0.13 and older masters will be "often" caught (see the patch); 4.0.14
and newer masters will always be immediately caught.


sql/slave.cc:
  Instead of looking like working (bug #198), replication between
  a 3.23 slave and 4.0 master should frankly stop. Here we detect
  4.0 masters in the 3.23 slave code when we see a strange Rotate
  event, and in that case we print an error and stop.
  4.0.13 and older masters will be "often" caught (see the patch); 4.0.14
  and newer masters will always be immediately caught.

configure.in:
  Updated AM_INIT_AUTOMAKE to following version
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted