(Patch from 4.0.5)


mysql-test/r/group_by.result:
  Updated results
mysql-test/t/group_by.test:
  Test for bug
sql/item_cmpfunc.cc:
  Fixed bug in MAX() optimization when used with JOIN and ON expressions
sql/item_cmpfunc.h:
  Fixed bug in MAX() optimization when used with JOIN and ON expressions
sql/opt_sum.cc:
  Fixed bug in MAX() optimization when used with JOIN and ON expressions

sql/mysqld.cc:
  Auto merged

 - reverted some incompatible/non-portable modifications


support-files/mysql.server.sh:
   - reverted non-portable change ("echo -n" does not work on all platforms)
   - reverted incompatible change (better fix the docs than break existing
     installations)

     - fix setting of niceness level

support-files/mysql.server.sh
     - applied some fixes from 4.0 mysql.server script
     - fix my.cnf parsing


scripts/safe_mysqld.sh:
   - fix setting of niceness level, if one adds "renice -20 $$" to safe_mysqld
     as hinted in the manual (which could result in NOHUP_NICENESS having a
     value of "-15" and hence there would be one dash too much)
support-files/mysql.server.sh:
   - applied some fixes from 4.0 mysql.server script
   - fix to actually parse the documented section ([mysql.server] not
     [mysql_server]) in my.cnf on startup

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

sql/mysqld.cc:
  Auto merged

Fix for Mac OS X shutdown


mysql-test/mysql-test-run.sh:
  Log client error messages
mysql-test/r/null_key.result:
  Test for bug in <=> NULL
mysql-test/t/null_key.test:
  Test for bug in <=> NULL
sql/mysqld.cc:
  Fix for Mac OS X shutdown
sql/opt_range.cc:
  Fixed bug with indexed NULL column <=> NULL

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

mysql-test/r/func_test.result:
  Fixing the error in result

 - applied some changes from the 4.0 tree (enable multiple 
   --conf-environment options, add --with-debug, don't add "-max"
   prefix just because BDB is enabled)


Build-tools/Do-compile:
   - applied some changes from the 4.0 tree (enable multiple 
     --conf-environment options, add --with-debug, don't add "-max"
     prefix just because BDB is enabled)

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

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

  Backport of bug fix in 4.0: do not x-lock rows under LOCK TABLES READ unless the table is a temp table


sql/ha_innobase.cc:
  Backport of bug fix in 4.0: do not x-lock rows under LOCK TABLES READ unless the table is a temp table

  Backport of bug fix in 4.0: do not x-lock rows under LOCK TABLES READ unless the table is a temp table


innobase/include/row0mysql.h:
  Backport of bug fix in 4.0: do not x-lock rows under LOCK TABLES READ unless the table is a temp table
innobase/row/row0mysql.c:
  Backport of bug fix in 4.0: do not x-lock rows under LOCK TABLES READ unless the table is a temp table

   (thanks to Gwenole Beauchesne <gbeauchesne@mandrakesoft.com>


bdb/dist/aclocal/mutex.m4:
   - applied patch for AMD x86-64

configure.in:
  Auto merged

 - "make distcheck" needs to be fixed


BitKeeper/etc/ignore:
  Added autom4te.cache/output.0 autom4te.cache/requests autom4te.cache/traces.0 bdb/dist/autom4te.cache/output.0 bdb/dist/autom4te.cache/requests bdb/dist/autom4te.cache/traces.0 innobase/autom4te.cache/output.0 innobase/autom4te.cache/requests innobase/autom4te.cache/traces.0 to the ignore list
acinclude.m4:
   - removed libtool.m4 (is part of libtool 1.4)
config.guess:
   - applied diffs from config.guess of automake 1.5
config.sub:
   - applied diffs from config.sub of automake 1.5
configure.in:
   - renamed "AM_PROG_LIBTOOL" -> "AC_PROG_LIBTOOL"
   - added "AM_PROG_AS" for automake 1.5
dbug/Makefile.am:
   - removed OMIT_DEPENDENCIES to make automake 1.5 happy
extra/Makefile.am:
   - removed OMIT_DEPENDENCIES to make automake 1.5 happy
heap/Makefile.am:
   - removed OMIT_DEPENDENCIES to make automake 1.5 happy
install-sh:
   - applied diffs from install.sh of automake 1.5
isam/Makefile.am:
   - removed OMIT_DEPENDENCIES to make automake 1.5 happy
libmysql_r/Makefile.am:
   - removed OMIT_DEPENDENCIES to make automake 1.5 happy
ltconfig:
   - small correction for new libtool
ltmain.sh:
   - applied diffs from ltmain.sh of libtool 1.4.2
merge/Makefile.am:
   - removed OMIT_DEPENDENCIES to make automake 1.5 happy
missing:
   - applied diffs from missing of automake 1.5
myisam/Makefile.am:
   - removed OMIT_DEPENDENCIES to make automake 1.5 happy
myisammrg/Makefile.am:
   - removed OMIT_DEPENDENCIES to make automake 1.5 happy
mysys/Makefile.am:
   - removed OMIT_DEPENDENCIES to make automake 1.5 happy
   - added $(EXEEXT) to test_charset
regex/Makefile.am:
   - removed OMIT_DEPENDENCIES to make automake 1.5 happy
sql/Makefile.am:
   - removed OMIT_DEPENDENCIES to make automake 1.5 happy
strings/Makefile.am:
   - removed OMIT_DEPENDENCIES to make automake 1.5 happy
   - removed @CHARSET_SRCS@
vio/Makefile.am:
   - removed OMIT_DEPENDENCIES to make automake 1.5 happy

scripts/mysqlhotcopy.sh:
   - added missing "--host" option
sql-bench/test-create.sh:
   - fixed typo
support-files/mysql.server.sh:
   - fixed typo

Fix for another optimize bug is undone, as the new one handles both cases.
test added


mysql-test/r/myisam.result:
  updated
mysql-test/t/myisam.test:
  optimize table corruption test
sql/ha_myisam.cc:
  optimize table corruption fixed, though more clean fix is desired.
  Fix for another optimize bug is undone, as the new one handles both cases.

  Backport from 4.0 a bug fix: if unique search from a primary key matched a delete-marked record, InnoDB could return the NEXT record


innobase/row/row0sel.c:
  Backport from 4.0 a bug fix: if unique search from a primary key matched a delete-marked record, InnoDB could return the NEXT record

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

Quote all table names with backticks.  

into geopard.(none):/storage/bk/mysql-3.23


BitKeeper/etc/gone:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union

BitKeeper/etc/ignore:
  Added depcomp to the ignore list

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