sql/sql_table.cc:
  code cleanup

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

BitKeeper/etc/ignore:
  Added innobase/stamp-h1 stamp-h1 to the ignore list

   handling (backport from 4.0 tree)

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

 - sql_analyse.cc: Fixed bug in decimal handling


configure.in:
   - Portability fix for HP compiler on HPUX11
libmysql/password.c:
   - Portability fix for HP compiler on HPUX11
mysys/hash.c:
   - Portability fix for HP compiler on HPUX11
mysys/my_static.c:
   - Portability fix for HP compiler on HPUX11
mysys/my_static.h:
   - Portability fix for HP compiler on HPUX11
mysys/my_tempnam.c:
   - Portability fix for HP compiler on HPUX11
sql/sql_analyse.cc:
   - Fixed bug in decimal handling

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

Workaround for problem with autconf 2.53 on Solaris
(Fixes problem with SOCKET_SIZE_TYPE)


BUILD/compile-solaris-sparc:
  Removed non standard compiler options
BUILD/compile-solaris-sparc-purify:
  Removed non standard compiler options
acinclude.m4:
  Fixed 'stack direction' check.
  Workaround for problem with autconf 2.53 on Solaris
  (Fixes problem with SOCKET_SIZE_TYPE)

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

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

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

otherwise COM_CHANGE_USER is unprotected and can be used for both privilege escalation and buffer overrun

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

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

sql/sql_show.cc:
  moving a fix to 4.1.

mysql-test/r/group_by.result:
  Auto merged
mysql-test/t/group_by.test:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged

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

(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

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

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

 - parse mysql.server section in my.cnf as well

sql/mysqld.cc:
  Auto merged

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

 - 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