mysql-test/mysql-test-run.sh:
  Ensure that tests are sorted
mysql-test/r/type_decimal.result:
  Test for bug with decimal()
mysql-test/t/type_decimal.test:
  Test for bug with decimal()
sql/sql_parse.cc:
  Fixed bug in CREATE ... DECIMAL(-1,1)

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


sql/sql_parse.cc:
  Auto merged

Fix for USE_FRM and crashed index file


configure.in:
  Fix for MacOSX and symlinks
myisam/mi_open.c:
  Give better error message in case of of crashed index file
mysql-test/r/repair.result:
  new test case
mysql-test/r/update.result:
  new test case
mysql-test/t/repair.test:
  Added test with crashed MyISAM index header
mysql-test/t/update.test:
  Added test case from bugs system
sql/handler.cc:
  Indentation changes
sql/sql_table.cc:
  Fix for USE_FRM and crashed index file

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

SHOW SLAVE STATUS and SHOW MASTER STATUS, because this is what
the manual states. We still accept SUPER.

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


include/my_global.h:
  Auto merged

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

Bug ID 381.

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

into mysql.com:/home/pem/work/mysql-4.0

   nodeterministic results on some platforms

mysql-test/t/key.test:
  Forgot to correct comment (after fixing bug 390).

mysql-test/r/update.result:
  new test
mysql-test/t/update.test:
  Test of UPDATE ... LIMIT
sql/sql_update.cc:
  Fixed 'Unknown error' when using 'UPDATE ... LIMIT'

   (thanks to Christian Hammers from the Debian project for providing it)
 - Updated version number in man pages (3.23 -> 4.0)


man/Makefile.am:
   - added mysql_fix_privilege_tables(1) man page to man_MANS
man/isamchk.1:
   - Updated version number ("MySQL-3.23" -> "MySQL 4.0")
man/isamlog.1:
   - Updated version number ("MySQL-3.23" -> "MySQL 4.0")
man/mysql.1:
   - Updated version number ("MySQL-3.23" -> "MySQL 4.0")
man/mysql_zap.1:
   - Updated version number ("MySQL-3.23" -> "MySQL 4.0")
man/mysqlaccess.1:
   - Updated version number ("MySQL-3.23" -> "MySQL 4.0")
man/mysqladmin.1:
   - Updated version number ("MySQL-3.23" -> "MySQL 4.0")
man/mysqld.1:
   - Updated version number ("MySQL-3.23" -> "MySQL 4.0")
man/mysqld_multi.1:
   - Updated version number ("MySQL-3.23" -> "MySQL 4.0")
man/mysqld_safe.1:
   - Updated version number ("MySQL-3.23" -> "MySQL 4.0")
man/mysqldump.1:
   - Updated version number ("MySQL-3.23" -> "MySQL 4.0")
man/mysqlshow.1:
   - Updated version number ("MySQL-3.23" -> "MySQL 4.0")
man/perror.1:
   - Updated version number ("MySQL-3.23" -> "MySQL 4.0")
man/replace.1:
   - Updated version number ("MySQL-3.23" -> "MySQL 4.0")

- Fix for QNX: UNIX sockets available since 6.2.1


include/my_global.h:
  Fix for QNX: UNIX sockets available since 6.2.1
mysql-test/r/variables.result:
  Fixed a bug in myisam_max_[extra]_sort_file_size, bug ID 339
mysql-test/t/variables.test:
  Fixed a bug in myisam_max_[extra]_sort_file_size, bug ID 339
sql/mysqld.cc:
  Fixed a bug in myisam_max_[extra]_sort_file_size, bug ID 339
sql/set_var.cc:
  Fixed a bug in myisam_max_[extra]_sort_file_size, bug ID 339
sql/set_var.h:
  Fixed a bug in myisam_max_[extra]_sort_file_size, bug ID 339

sql/sql_select.cc:
  Fixed problem with ansi mode and GROUP BY with constants

Fixed wrong logging of Access denied error (Bug #398)


include/my_global.h:
  Fix for QNX
mysql-test/r/union.result:
  new test case
mysql-test/t/union.test:
  Test of bug in union and left join
mysys/my_seek.c:
  Safety fix to find out when pos gets a wrong value
sql/field.h:
  Fix for UNION and LEFT JOIN
sql/mysql_priv.h:
  Fix for UNION and LEFT JOIN
sql/sql_base.cc:
  Fix for UNION and LEFT JOIN
sql/sql_insert.cc:
  Fix for UNION and LEFT JOIN
sql/sql_parse.cc:
  Fixed wrong logging of Access denied error
sql/sql_union.cc:
  Fix for UNION and LEFT JOIN
sql/sql_update.cc:
  Fix for UNION and LEFT JOIN

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

Needed by QNX, and there was no real use for timing.

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

Better fix for format('nan')
Fix for HAVING COUNT(DISTINCT...)


myisam/mi_check.c:
  Better error message
myisam/mi_dynrec.c:
  Simple code cleanup
myisam/myisamchk.c:
  Better error messages
mysql-test/r/func_misc.result:
  Added back test for format('nan')
mysql-test/r/having.result:
  New test
mysql-test/t/func_misc.test:
  Added back test for format('nan')
mysql-test/t/having.test:
  Added test for count(distinct) in having
mysys/raid.cc:
  Safety fix to enable RAID in max binaries
scripts/mysql_install_db.sh:
  Create data directories even if --in-rpm is used (for MaxOSX)
sql/item_strfunc.cc:
  Better fix for format('nan')
sql/mysqld.cc:
  Give stacktrace on assert()
sql/sql_yacc.yy:
  Fix for HAVING COUNT(DISTINCT...)
tests/big_record.pl:
  Extend test to abuse packed MyISAM tables
tests/table_types.pl:
  Fixed wrong merge

   the installation to make sure the privilege tables are being
   installed even if the DNS configuration is broken, which seems
   to be quite common (reverse lookups to "hostname" fail).

   This should resolve the problem many Mac OS users experience
   ("Fatal error: Can't open privilege tables: Table 'mysql.host' doesn't
   exist") when they try to start MySQL after installing the PKG.

  Let InnoDB to skip writing of pages from the doublewrite buffer if innodb_force_recovery=6; normally, if the page is corrupt AND the corresponding page in the doublewrite buffer is also corrupt, InnoDB calls exit(1)


innobase/trx/trx0sys.c:
  Let InnoDB to skip writing of pages from the doublewrite buffer if innodb_force_recovery=6; normally, if the page is corrupt AND the corresponding page in the doublewrite buffer is also corrupt, InnoDB calls exit(1)
innobase/srv/srv0start.c:
  Let InnoDB to skip writing of pages from the doublewrite buffer if innodb_force_recovery=6; normally, if the page is corrupt AND the corresponding page in the doublewrite buffer is also corrupt, InnoDB calls exit(1)

   MySQL-classic did not pass the test suite rpl_rotate_logs.test anymore because a recent 1.1424.2.17 cset introduced an opt_using_transactions
    which prevented binlogs to be rotated if transactions were not enabled. Fix for this. This bug did not affect releases.


sql/log.cc:
  MySQL-classic did not pass the test suite rpl_rotate_logs.test anymore because a recent 1.1424.2.17 cset introduced an opt_using_transactions
  which prevented binlogs to be rotated if transactions were not enabled. Fix for this. This bug did not affect releases.

sql/sql_base.cc:
  merge

BitKeeper/etc/logging_ok:
  auto-union
sql/sql_acl.cc:
  Auto merged
tests/grant.pl:
  Auto merged
tests/grant.res:
  Auto merged
BitKeeper/triggers/post-commit:
  use local file
client/mysqldump.c:
  Merge to get crash fix

Security patch to remove wrong error when one had a global update/delete privilige and a database specific SELECT privilege. 


sql/sql_acl.cc:
  Security patch
sql/sql_base.cc:
  Security patch
sql/sql_parse.cc:
  Security patch
tests/grant.pl:
  Test of security patch
tests/grant.res:
  Test of security patch

  Fix bug: if MIN() or MAX() resulted in a deadlock or a lock wait timeout, MySQL did not return an error, but NULL as the function value


include/my_base.h:
  Fix bug: if MIN() or MAX() resulted in a deadlock or a lock wait timeout, MySQL did not return an error, but NULL as the function value

  Fix bug: if MIN() or MAX() resulted in a deadlock or a lock wait timeout, MySQL did not return an error, but NULL as the function value


sql/opt_sum.cc:
  Fix bug: if MIN() or MAX() resulted in a deadlock or a lock wait timeout, MySQL did not return an error, but NULL as the function value
sql/sql_select.cc:
  Fix bug: if MIN() or MAX() resulted in a deadlock or a lock wait timeout, MySQL did not return an error, but NULL as the function value

   can be used to build a compatibility package that includes the shared
   libraries of MySQL 3.23.xx and MySQL 4.0.xx for backwards compatibility
   with dynamically linked applications. It simply repackages the two
   MySQL-shared RPMs, so these need to be created or downloaded separately.


support-files/Makefile.am:
   - added MySQL-shared-compat.spec(.sh) to the distribution

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

sql/time.cc:
  Removed not used code
  Fixed that reading a DATE string of 000000 is interpreted as 0000-00-00 instead of 2000-00-00

  Better warning message if more than 4 / 5 of the buffer pool is consumed by locks of adaptive hash index


innobase/buf/buf0flu.c:
  Better warning message if more than 4 / 5 of the buffer pool is consumed by locks of adaptive hash index
innobase/buf/buf0lru.c:
  Better warning message if more than 4 / 5 of the buffer pool is consumed by locks of adaptive hash index

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


sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged

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