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

 - updated logo to current one


Docs/Images/mysql-logo.gif:
   - updated logo to current one

BitKeeper/deleted/.del-template.texi~e93e39114ba9bcf7:
  Delete: Docs/template.texi

Replaced mysql.de.texi in mysql-4.0 tree with dummy placeholder.
Moved world.sql sample database to mysqldoc tree.


BitKeeper/deleted/.del-world.sql~6603b5c62c5bac53:
  Delete: Docs/world.sql
Docs/manual.de.texi:
  Moved mysql.de.texi from mysql-4.0 tree to mysqldoc tree.
  Replaced mysql.de.texi in mysql-4.0 tree with dummy placeholder.

- re-added missing pre- and post(un)install scripts to server subpackage
- added config file /etc/my.cnf to the file list (just for completeness)
- make sure to create the datadir with 755 permissions


support-files/mysql.spec.sh:
  - re-added missing pre- and post(un)install scripts to server subpackage
  - added config file /etc/my.cnf to the file list (just for completeness)
  - make sure to create the datadir with 755 permissions

include/my_sys.h:
  Remove compiler warning
mysql-test/mysql-test-run.sh:
  Don't examine log files when you run with --extern

into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.0


Build-tools/Do-compile:
  Auto merged
bdb/dist/configure.in:
  Auto merged
scripts/mysqlhotcopy.sh:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged

BitKeeper/etc/ignore:
  Added support-files/MacOSX/Description.plist support-files/MacOSX/Info.plist to the ignore list

BUILD/FINISH.sh:
  Abort if one of configuration script fails

sql-bench/limits/mysql.cfg:
  Updated results

  new file

Don't make OLD_PASSWORD() a reserved word


mysql-test/r/explain.result:
  Test select count(*)
mysql-test/r/func_crypt.result:
  Test old_password()
mysql-test/t/explain.test:
  Test select count(*)
mysql-test/t/func_crypt.test:
  Test old_password()
sql/item_create.cc:
  Don't make OLD_PASSWORD() a reserved word
sql/item_create.h:
  Don't make OLD_PASSWORD() a reserved word
sql/lex.h:
  Don't make OLD_PASSWORD() a reserved word
sql/opt_range.cc:
  Remove blank space
sql/opt_sum.cc:
  Fix problem in MIN/MAX optimisation

  Disable PAGE_CUR_LE_OR_EXTENDS because it does not work for non-latin1 char sets now


innobase/page/page0cur.c:
  Disable PAGE_CUR_LE_OR_EXTENDS because it does not work for non-latin1 char sets now

  Clarify the meaning of HA_READ_PREFIX_LAST as a search flag. InnoDB assumed the meaning wrong.


sql/ha_innodb.cc:
  Clarify the meaning of HA_READ_PREFIX_LAST as a search flag. InnoDB assumed the meaning wrong.

  Since MySQL uses HA_READ_PREFIX_LAST in a wrong place, we make InnoDB to convert it to a right search condition


sql/ha_innodb.cc:
  Since MySQL uses HA_READ_PREFIX_LAST in a wrong place, we make InnoDB to convert it to a right search condition

Makefile.am:
  Remove blank lines
configure.in:
  Keep version gamma

  Sinisas patch to InnoDB ORDER BY DESC bug, push it now so that Jani has it available


innobase/page/page0cur.c:
  Sinisas patch to InnoDB ORDER BY DESC bug, push it now so that Jani has it available

Added ALL as parameter option for all group functions.
Make join handling uniform. This allows us to use ',', JOIN and INNER JOIN the same way.
Sort NULL last if DESC is used (ANSI SQL 99 requirement)


include/my_global.h:
  Moved LL from mysql_priv (as this is also in config-win.h)
mysql-test/r/distinct.result:
  Updated results
mysql-test/r/func_group.result:
  Updated results
mysql-test/r/innodb.result:
  Updated results
mysql-test/r/join.result:
  Updated results
mysql-test/r/order_by.result:
  Updated results
mysql-test/t/func_group.test:
  Added test for SUM(ALL ...)
mysql-test/t/innodb.test:
  Added test for START TRANSACTION
mysql-test/t/join.test:
  Test different join syntaxes
mysql-test/t/order_by.test:
  Added new test of NULL ordering.
sql/filesort.cc:
  Sort NULL last if DESC is used
sql/lex.h:
  Added OLD_PASSWORD() as synonym for PASSWORD.
sql/mysql_priv.h:
  Removed LL()
sql/opt_range.cc:
  Sort NULL last if DESC is used
sql/opt_range.h:
  Sort NULL last if DESC is used
sql/slave.cc:
  Indentation changes
sql/sql_parse.cc:
  After merge fix
sql/sql_select.cc:
  Added comment
sql/sql_yacc.yy:
  Added START TRANSACTION syntax
  Added ALL as parameter option for all group functions.
  Make join handling uniform.

 - add version number to build log files (e.g. Logs/build-4.1-standard.log)
 - add host name and uname to Subject line of build failure mails
   (e.g. "Subject: build(Linux): mysql-4.1-standard compilation failed")

 -> Please merge with all other trees!


Build-tools/Do-compile:
  Small enhancements:
   - add version number to build log files (e.g. Logs/build-4.1-standard.log)
   - add host name and uname to Subject line of build failure mails
     (e.g. "Subject: build(Linux): mysql-4.1-standard compilation failed")

   the --password parameter (better add it to my.cnf instead) (Thanks to
   Christian Hammers for the suggestion)


scripts/mysqlhotcopy.sh:
   - added word of warning about providing the password as cleartext using
     the --password parameter (better add it to my.cnf instead)

   address to report bugs to bugs@mysql.com (thanks to Christian Hammers
   for pointing this out) - please merge this into all other trees!


scripts/mysqlaccess.sh:
   - Yves mail address does not seem to be valid anymore - changed mail
     address to report bugs to bugs@mysql.com (thanks to Christian Hammers
     for pointing this out)

  new file
.del-overlay.tar.gz~5bd3087e191e7574:
  Delete: netware/overlay.tar.gz


BitKeeper/deleted/.del-overlay.tar.gz~5bd3087e191e7574:
  Delete: netware/overlay.tar.gz

  Backport from 4.0: fix potential bug if store_lock is called with TL_IGNORE in the middle of a query


sql/ha_innobase.cc:
  Backport from 4.0: fix potential bug if store_lock is called with TL_IGNORE in the middle of a query

  Fix potential bug: if MySQL calls store_lock with the TL_IGNORE argument in the middle of query processing, then InnoDB select_lock_type could be reset to LOCK_NONE in a wrong place


sql/ha_innodb.cc:
  Fix potential bug: if MySQL calls store_lock with the TL_IGNORE argument in the middle of query processing, then InnoDB select_lock_type could be reset to LOCK_NONE in a wrong place

   and actually results in an error with very recent autoconf versions!
   (see http://www.gnu.org/manual/autoconf/html_node/autoconf_165.html or
    "AC_LIBOBJ vs. LIBOBJS" in the autoconf documentation)
   Please merge this into 4.0 as well!

mysql-test/r/bigint.result:
  Test if big LONG_NUM
mysql-test/t/bigint.test:
  Test if big LONG_NUM

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


configure.in:
  Auto merged

   MacOSX packages using PackageMaker
 - renamed support-files/PKG -> support-files/SCO (PKG is used in MacOS X
   terminology as well)


support-files/SCO/INSTALL.sh:
  mvdir
support-files/SCO/compile.sh:
  mvdir
support-files/SCO/doc.sh:
  mvdir
support-files/SCO/mkpkg.sh:
  mvdir
support-files/SCO/patch:
  mvdir
support-files/SCO/pkginfo.ini:
  mvdir
support-files/SCO/postinstall:
  mvdir
support-files/SCO/preinstall:
  mvdir
support-files/SCO/preremove:
  mvdir
support-files/SCO/prototype.ini:
  mvdir
support-files/SCO/version:
  mvdir
support-files/MacOSX/make_mysql_pkg.pl:
  Rename: support-files/make_mysql_pkg.pl -> support-files/MacOSX/make_mysql_pkg.pl
configure.in:
   - added support-files/MacOSX
support-files/Makefile.am:
   - added MacOSX subdirectory

MIN(key_column) could in some cases return NULL on a column with NULL and other values.
MIN(key_column) and MAX(key_column) could in some cases return wrong values when used in OUTER JOIN.


configure.in:
  Updated version number
libmysqld/libmysqld.c:
  Portability fix (for windows)
mysql-test/r/func_group.result:
  Added test case for MIN/MAX problems
mysql-test/t/func_group.test:
  Added test case for MIN/MAX problems
sql/item.h:
  Fix for MIN/MAX with empty tables
sql/item_sum.h:
  Fix for MIN/MAX with empty tables
sql/opt_sum.cc:
  MIN(key_column) could in some cases return NULL on a column
  with NULL and other values.
  MIN(key_column) and MAX(key_column) could in some cases
  return wrong values when used in OUTER JOIN.
sql/sql_select.cc:
  Fix for MIN/MAX with empty tables

  Added a conditional to prevent compilation of netware executables


netware/Makefile.am:
  Added a conditional to prevent compilation of netware executables