into sinisa.nasamreza.org:/mnt/work/mysql-4.0


sql/sql_show.cc:
  Auto merged

  Merge InnoDB-4.0.13; DROP FOREIGN KEY now works


innobase/buf/buf0flu.c:
  Merge InnoDB-4.0.13; DROP FOREIGN KEY now works
innobase/dict/dict0crea.c:
  Merge InnoDB-4.0.13; DROP FOREIGN KEY now works
innobase/dict/dict0dict.c:
  Merge InnoDB-4.0.13; DROP FOREIGN KEY now works
innobase/dict/dict0load.c:
  Merge InnoDB-4.0.13; DROP FOREIGN KEY now works
innobase/ibuf/ibuf0ibuf.c:
  Merge InnoDB-4.0.13; DROP FOREIGN KEY now works
innobase/include/db0err.h:
  Merge InnoDB-4.0.13; DROP FOREIGN KEY now works
innobase/include/dict0dict.h:
  Merge InnoDB-4.0.13; DROP FOREIGN KEY now works
innobase/include/row0ins.h:
  Merge InnoDB-4.0.13; DROP FOREIGN KEY now works
innobase/lock/lock0lock.c:
  Merge InnoDB-4.0.13; DROP FOREIGN KEY now works
innobase/os/os0file.c:
  Merge InnoDB-4.0.13; DROP FOREIGN KEY now works
innobase/row/row0ins.c:
  Merge InnoDB-4.0.13; DROP FOREIGN KEY now works
innobase/row/row0mysql.c:
  Merge InnoDB-4.0.13; DROP FOREIGN KEY now works
innobase/row/row0sel.c:
  Merge InnoDB-4.0.13; DROP FOREIGN KEY now works
innobase/row/row0upd.c:
  Merge InnoDB-4.0.13; DROP FOREIGN KEY now works
innobase/srv/srv0srv.c:
  Merge InnoDB-4.0.13; DROP FOREIGN KEY now works
innobase/ut/ut0ut.c:
  Merge InnoDB-4.0.13; DROP FOREIGN KEY now works
sql/ha_innodb.cc:
  Merge InnoDB-4.0.13; DROP FOREIGN KEY now works

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

Added logging of warnings for failed connections with ssl.
Fixed bug in symbolic link handling on Windows


include/my_global.h:
  Added replication flags from 4.1
mysql-test/r/func_group.result:
  Added test for SUM(NULL)
mysql-test/t/func_group.test:
  Added test for SUM(NULL)
sql/item_sum.cc:
  Fixed bug in SUM() with NULL:s
sql/item_sum.h:
  Fixed bug in SUM() with NULL:s
sql/mysqld.cc:
  Added option --symbolic-links
  Fixed bug in symbolic link handling on Windows
sql/net_serv.cc:
  Code cleanup
sql/sql_acl.cc:
  Added logging of warnings for failed connections with ssl.
sql/sql_show.cc:
  Changed to use HAVE_REPLICATION instead of EMBEDDED_LIBRARY

   (bug #223)
 - Added more detailed info about how to set up replication


support-files/my-huge.cnf.sh:
   - updated variable names that have been renamed in 4.0 (bug #223)
   - added more detailed info about how to set up replication (suggestion
     made by Guilhem)
support-files/my-large.cnf.sh:
   - updated variable names that have been renamed in 4.0 (bug #223)
   - added more detailed info about how to set up replication (suggestion
     made by Guilhem)
support-files/my-medium.cnf.sh:
   - updated variable names that have been renamed in 4.0 (bug #223)
   - added more detailed info about how to set up replication (suggestion
     made by Guilhem)
support-files/my-small.cnf.sh:
   - updated variable names that have been renamed in 4.0 (bug #223)
   - added hint and commented out sample about skip-networking option
     (security enhancement)

   (bug #264)

into sinisa.nasamreza.org:/mnt/work/mysql-4.0

mysql-test/r/innodb.result:
  Fix for a bug that caused queries with ORDER BY field_in_select_list
  to be returned entirely unsorted.
mysql-test/t/innodb.test:
  Fix for a bug that caused queries with ORDER BY field_in_select_list
  to be returned entirely unsorted.
sql/sql_select.cc:
  Fix for a bug that caused queries with ORDER BY field_in_select_list
  to be returned entirely unsorted.
sql/sql_update.cc:
  Fix for a glitch that caused too many tables to be locked.

 - added Dummy file Docs/manual_toc.html to make "make dist" happy if the
   real manual.texi has not been copied into Docs/ (which would make sure
   a "real" manual_toc.html would be created
 - fixed symlinking in the bdb subdirectory (docs are not included anyway)
 - added dist-hook to Makefile.am to remove superfluous SCCS directories
   from the source distribution


Makefile.am:
   - added dist-hook to remove superfluous SCCS directories from the source
     distribution
bdb/dist/s_symlink:
   - don't try to create symlinks to nonexisting doc files

 - adjusted LSB run levels to be identical as on Red Hat (2-5)

into sinisa.nasamreza.org:/mnt/work/mysql-4.0

   libraries always ended up in "dir..", even though they were not supposed
   to be installed anyway (they are only required at link time). Fixed it by
   replacing libs_LIBRARIES with noinst_LIBRARIES for all InnoDB Makefile.am 
   files and by removing "libsdir = " from innobase/include/Makefile.i .


innobase/btr/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/buf/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/com/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/data/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/dict/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/dyn/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/eval/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/fil/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/fsp/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/fut/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/ha/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/ibuf/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/include/Makefile.i:
   - removed libsdir = ../libs to fix a bug in "make DESTDIR=<dir> install"
     (the libs always got installed in "dir../")
innobase/lock/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/log/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/mach/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/mem/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/mtr/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/odbc/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/os/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/page/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/pars/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/que/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/read/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/rem/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/row/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/srv/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/sync/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/thr/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/trx/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/usr/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/ut/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)

   in the sample configuration files
 - reworked the replication options and comments a bit
 - added option "skip-networking" (commented out by default) to the
   sample configuration files (enhancement request from bug report #234)


support-files/my-huge.cnf.sh:
   - work around bug #235 (comments at the end of configuration options lead
     to errors) by reformatting the comments to be above the options instead
   - enhanced comments on the replication options a bit
   - added option "skip-networking" (commented out by default) with an
     appropriate comment (bug #234)
support-files/my-large.cnf.sh:
   - work around bug #235 (comments at the end of configuration options lead
     to errors) by reformatting the comments to be above the options instead
   - enhanced comments on the replication options a bit
   - added option "skip-networking" (commented out by default) with an
     appropriate comment (bug #234)
support-files/my-medium.cnf.sh:
   - work around bug #235 (comments at the end of configuration options lead
     to errors) by reformatting the comments to be above the options instead
   - enhanced comments on the replication options a bit
   - added option "skip-networking" (commented out by default) with an
     appropriate comment (bug #234)

   to run the script even if mysqld is not up and running on upgrade


scripts/mysql_fix_privilege_tables.sh:
   - applied Patch provided by Christian Hammers from Debian to be able to run
     this script on every upgrade without having to worry that the server
     is really running. Therefore "mysqld --bootstrap" is used to make the
     changes. For this to work all SQL statements are sent to stderr when
     "--sqlonly" is given and the echo's are piped to /dev/null.
     The echo_stderr that is used is just a "#!/bin/sh\necho "$*" >&2"
     script.

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

into sinisa.nasamreza.org:/mnt/work/mysql-4.0

(3.23 master, 4.0 slave. 
Slave loss temp tables everytime FLUSH LOGS on master). 
This fix is less bad than the bug, it will cause a problem only maybe
if the master dies the hard way (I say maybe because I could not
cause a problem, and I don't see how it could happen).


sql/log_event.cc:
  fix for #254
  (3.23 master, 4.0 slave. 
  Slave loss temp tables everytime FLUSH LOGS on master). 
  This fix is less bad than the bug, it will cause a problem only maybe
  if the master dies the hard way. (I say maybe because I could not
  cause a problem, and I don't see how it could happen).

sql/mysql_priv.h:
  stack checking suppressed in EMBEDDED case
sql/sql_parse.cc:
  code of check_stack_overrun ifdefed

   if it's built with debugging enabled or not stripped (save disk
   space)

mysql-test/r/myisam.result:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged

into sanja.is.com.ua:/home/bell/mysql/bk/work-limit-4.0

into sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0

  Fix crash in previous bug fix log.cc reported by Rob Lyon if --skip-innodb is specified


sql/log.cc:
  Fix crash in previous bug fix log.cc reported by Rob Lyon if --skip-innodb is specified

  add sorted_group_by parameter


sql-bench/crash-me.sh:
  add sorted_group_by parameter

into mysql.com:/home/walrus/bk/40

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

yet, better say it and see no traffic on bugs@ and support@.

into hundin.mysql.fi:/home/heikki/mysql-4.0


sql/log.cc:
  Auto merged

because of writing problems (such message would have been useful during a recent
support task).

  Fix bug number 224: do not call ha_report_binlog_offset_and_commit() when a MyISAM table is updated; this also makes CREATE TABLE not to commit an InnoDB transaction, even when binlogging is enabled


sql/log.cc:
  Fix bug number 224: do not call ha_report_binlog_offset_and_commit() when a MyISAM table is updated; this also makes CREATE TABLE not to commit an InnoDB transaction, even when binlogging is enabled

into hynda.(none):/home/my/bk/mysql-4.0

sql/log_event.cc:
  Fixed a wrong && test -> &