into gluh.mysql.r18.ru:/home/gluh/MySQL-BUGS/mysql-4.0

client/mysqltest.c:
  allow big commands in mysql-test

  Small fixes to handle packaging of windows src (commercial) file


Build-tools/mysql-copyright:
  Small fixes to handle packaging of windows src (commercial) file

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

scripts/mysql_install_db.sh:
  Cleanup

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

scripts/mysqld_safe.sh:
  don't protect mysqld from multiple --user commands - mysqld can take care of itself
sql/mysqld.cc:
  warn about multiple --user parameters only if their arguments differ

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


sql/sql_parse.cc:
  Auto merged

mysql-test/t/type_date.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
mysql-test/r/type_date.result:
  merge with 3.23

sql/sql_parse.cc:
  Cleanup of patch

if OpenSSL is installed in non-statndart directory
('openssl/opensslv.h: No such file or directory')


include/my_global.h:
  Fixed issue with compilation MySQL with OpenSSL 
  if OpenSSL is installed in non-statndart directory
include/violite.h:
  Fixed issue with compilation MySQL with OpenSSL 
  if OpenSSL is installed in non-statndart directory

the rpm postinstall script must call mysql_install_db with --user=mysql,
and mysql_install_db must then pass this to mysqld. Otherwise, mysqld
runs as root, and if you have --log-bin=somewhere_out_of_var_lib_mysql
it creates binlog files owned by root in this dir, and this dir is not
fixed by the 'chmod mysql', so files remain owned by root, and later mysqld
(running as 'mysql') can't read them.
I'm hardcoding 'mysql' in the postinstall script, but it's already hardcoded
there in many places (see the useradd and chown) so it's ok.


scripts/mysql_install_db.sh:
  Pass --user to mysqld
support-files/mysql.spec.sh:
  in postinstall, call mysql_install_db with --user=mysql, so that mysqld (which installs the grant tables)
  is started with --user=mysql.

sql/sql_parse.cc:
  Making COM_DROP_DB honour lower_case_table_names. Plus coding-style fixes.

sql/sql_parse.cc:
  honour lower_case_table_names in DROP DATABASE (like we already do in CREATE DATABASE)

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

Build-tools/mysql-copyright-2:
  small fix
Build-tools/mysql-copyright:
  deals with windows src file now

into krsna.patg.net:/home/patg/mysql-4.0


Build-tools/Do-compile:
  Auto merged

VC++Files/examples/udf_example/udf_example.def:
  Add definitions of init and deinit functions

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

removed incorrect destructor (to prevent deleting item by recursion instead of by list scanning in case of chained OR or AND)

into teton.kitebird.com:/home/paul/bk/mysql-4.0

cmp_debug_dtuple_rec_with_match()
unless #ifdef UNIV_DEBUG


innobase/rem/rem0cmp.c:
  Remove cmp_debug_dtuple_rec_with_match() unless #ifdef UNIV_DEBUG

client/mysqltest.c:
  Fix compilation errors for NetWare

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

Portability fix for netware. (We can't use TRY_RUN when cross compiling)

into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.0

  Update README URL. (Bug #3678)


mysql-test/README:
  Update README URL. (Bug #3678)

  Inside LOCK TABLES, use either LOCK_S or LOCK_X in locking reads; an improvent over the previous patch


sql/ha_innodb.cc:
  Inside LOCK TABLES, use either LOCK_S or LOCK_X in locking reads; an improvent over the previous patch
innobase/include/row0mysql.h:
  Inside LOCK TABLES, use either LOCK_S or LOCK_X in locking reads; an improvent over the previous patch
innobase/row/row0mysql.c:
  Inside LOCK TABLES, use either LOCK_S or LOCK_X in locking reads; an improvent over the previous patch

will disable warnings, --log-warnings will increment warning level by one, or the
level can be given as an optional argument. Default level is 1.

Changed aborted connection warning to be logged only if the level is > 1.


sql/sql_class.h:
  Changed boolean into ulong.
sql/sql_parse.cc:
  Changed aborted connection warning to be logged only if the level is > 1.

sql/ha_innodb.cc:
  start_stmt(): Obtain an exclusive lock for other than plain SELECT

into deer.(none):/home/hf/work/mysql-4.0

include/mysql.h:
  (void) added to the empty parameter's list
libmysql/libmysql.c:
  (void) added to the empty parameter's list

Windows

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