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


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

  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

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

   case-insensitive File Systems (e.g. Mac OS X)

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

Fixed error when mysql_unix_port pointed to const string (not uncommon on windows)



client/mysql.cc:
  Fixed core dump bug when using \p in prompt on Windows.
sql/mysqld.cc:
  Fixed error when mysql_unix_port pointed to const string.

  new file
Makefile.am:
  Changes from Novell diff


netware/Makefile.am:
  Changes from Novell diff
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

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


sql/ha_innodb.cc:
  Auto merged

proper handling of SUM() in some functions.



BitKeeper/etc/logging_ok:
  auto-union
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/table.cc:
  Auto merged
mysql-test/r/group_by.result:
  merge with 3.23.56
mysql-test/t/group_by.test:
  merge with 3.23.56
sql/item_strfunc.h:
  merge with 3.23.56
sql/mysqld.cc:
  merge with 3.23.56
sql/sql_parse.cc:
  merge with 3.23.56
sql/sql_yacc.yy:
  merge with 3.23.56

sql/sql_table.cc:
  Added comments

Fixed handling of lower_case_table_names in SHOW TABLE STATUS, mysql_list_fields() and mysql_table_dump().
This fixes some Errcode 13 errors on Windows when deleting tables.



sql/mysql_priv.h:
  Moved lower case conversion of database names to check_db_name()
sql/mysqld.cc:
  Fix to be able to use 4.0 error message files
sql/sql_db.cc:
  Moved lower case conversion of database names to check_db_name()
sql/sql_parse.cc:
  Moved lower case conversion of database names to check_db_name()
  Added checking of lower_case_table_names for mysql_table_dump() and
  mysql_list_fields()
sql/sql_show.cc:
  Moved lower case conversion of database names to check_db_name()
sql/table.cc:
  Convert database names to lower case in check_db-name() if --lower-case-table-names is used.

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

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

  restore nake_time and make_time_r


sql-bench/crash-me.sh:
  restore nake_time and make_time_r

made bisone 1.75 compatible code


mysql-test/r/group_by.result:
  test of function with agregate function inside
mysql-test/t/group_by.test:
  test of function with agregate function inside
sql/item_cmpfunc.cc:
  fixed functions to be able work with group function as argument
sql/item_cmpfunc.h:
  fixed functions to be able work with group function as argument
sql/item_func.cc:
  fixed functions to be able work with group function as argument
sql/item_func.h:
  fixed functions to be able work with group function as argument
sql/item_strfunc.cc:
  fixed functions to be able work with group function as argument
sql/item_strfunc.h:
  fixed functions to be able work with group function as argument
sql/sql_yacc.yy:
  made bisone 1.75 compatible code
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

   operator)

  Cleanup of the previous bug fix: replace code is either SQLCOM_REPLACE or SQLCOM_REPLACE_SELECT


sql/ha_innodb.cc:
  Cleanup of the previous bug fix: replace code is either SQLCOM_REPLACE or SQLCOM_REPLACE_SELECT

  Fix a bug REPLACE INTO t SELECT ... did not work if t has an auto-inc column


sql/ha_innodb.cc:
  Fix a bug REPLACE INTO t SELECT ... did not work if t has an auto-inc column

into mysql.com:/home/pz/mysql/mysql-4.0-root

sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Use local vrsion

(On Windows --log-error is enabled by default)



mysys/my_getopt.c:
  Call get_one_option() also for boolean values.
scripts/mysqld_safe.sh:
  Add option --log-error
sql/log.cc:
  Fix for --log-error
sql/mysql_priv.h:
  Fix for --log-error
sql/mysqld.cc:
  Fix for --log-error
sql/sql_udf.cc:
  Lock the mysql/func table properly

sql/sql_class.cc:
  Fix Random hash initialization on for new connections to make result
  it more random

Makefile.am:
   - added netware to SUBDIRS
netware/Makefile.am:
   - add netware.patch to distribution

extra/perror.c:
  error messages fixups
include/my_base.h:
  error codes fixups
myisam/mi_open.c:
  correct error reported
myisam/myisamchk.c:
  correct error reported
myisammrg/myrg_open.c:
  correct error reported
sql/ha_innodb.cc:
  correct error reported
sql/ha_isam.cc:
  reorder table file extensions to get better error on "cannot open the table"
sql/ha_myisam.cc:
  reorder table file extensions to get better error on "cannot open the table"
sql/ha_myisammrg.cc:
  correct error reported
sql/handler.cc:
  correct error reported

Asked by Heikki and Peter.


sql/mysqld.cc:
  Use on Unix hostname.err only when --log-error=path.

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


sql/mysql_priv.h:
  Auto merged
sql/sql_table.cc:
  Auto merged