libmysqld/lib_sql.cc:
  Comment added
sql/sql_prepare.cc:
  Necessary line added to emb_insert_params_with_log

libmysqld/lib_sql.cc:
  max_allowed_packet - don't send client one to global
  thread initialization fixed
  "std" to "def" in catalog name
sql/mysqld.cc:
  added initialization of global_system_variables.max_allowed_packet
sql/set_var.cc:
  don't do this in embedded library

#4700 (Unsigned value returned as signed)
    just no appropriate checking
#4701 (Errors returned earlier than expected)
    all errors returned from send_command()
#4702 (Result isn't freed properly if there's no retrieval)
    flush_use_result has only 'client' version and should
    be made 'virtual'


include/mysql.h:
  flush_use_result 'virtual' method added to MYSQL (#4701)
include/sql_common.h:
  no flush_use_result() now (#4702)
libmysql/libmysql.c:
  call of the flush_use_result changed (#4702)
libmysqld/lib_sql.cc:
  now errors returned from emb_advanced_command() or from emb_read_rows()
  depending on if number of returned fields is not 0 (#4701)
  emb_flush_use_result() implementation (#4702)
sql-common/client.c:
  cli_flush_use_result() implementation (#4702)
sql/sql_prepare.cc:
  unsigned flag now checked (#4700)

into sanja.is.com.ua:/home/bell/mysql/bk/work-subs-4.1


sql/item_subselect.cc:
  Auto merged

into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1

into sanja.is.com.ua:/home/bell/mysql/bk/work-subs-4.1

into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1

into sanja.is.com.ua:/home/bell/mysql/bk/work-subs-4.1

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

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

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

   when copying a small index file because the value returned
   for $length is < 1024. This can happen if the filehandle
   was open()ed as an UTF-8 encoded file with Unicode characters
   (In this case read() returns characters not bytes)
   (Thanks to Mike Bethune) for this hint)

sql/item_subselect.cc:
  stack overflow check added for subqueries processing

  Language fixups.


scripts/mysql_fix_privilege_tables.sh:
  Language fixups.

   so it's included in the source distribution

   Mac OS X: the name of the startup script itself must match the
   name of the subdirectory it's located in. Changed MySQL->MySQLCOM 
   in the Do-pkg script and renamed the file in BK. (Thanks to Bryan
   McCormack for reporting this)


Build-tools/Do-pkg:
   - renamed script from MySQL to MySQLCOM to match the name of the
     directory it's installed in
support-files/MacOSX/MySQLCOM:
   - Fixed the file and directory name to match the actual location

into mysql.com:/home/mysql_src/mysql-4.1-874

by KILL or shutdown, do not mark the table as corrupted".
It is indeed more logical to leave the corruption flag unchanged.
This cannot be extended to REPAIR/OPTIMIZE as they make no backup copy
of the MYI. This patch was tested with KILL and mysqladmin shutdown
while a CHECK TABLE was running. Without the patch, the table becomes
unusable (can't INSERT to it, error 145). With the patch, no.


sql/ha_myisam.cc:
  When CHECK TABLE or ANALYZE TABLE is killed by KILL,
  do not mark the table corrupted; leave its corruption flag
  unchanged.

   linking with PHP5) (thanks to Georg Richter for the patch)

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

forced X/Open mode on HPUX removed. The correct way (that affects not only C but also C++ and linking) would be

CFLAGS="-D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED -D_HPUX_SOURCE"
CXXFLAGS="-D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED -D_HPUX_SOURCE"
LDFLAGS="-lxnet"

but apparently MySQL works without too.

bug#4527

mysys/my_init.c:
  Extra debugging
sql/mysqld.cc:
  Added comment
sql/sql_parse.cc:
  Removed unneeded info
vio/viosocket.c:
  Added assert.
  Don't close already closed files

sql/sql_show.cc:
  Auto merged
sql/mysql_priv.h:
  SCCS merged

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

charged sql/sql_db.cc only
(
changed length in mysql_create_db to path_len
so as it was calculated in the first unpack_dirname
in my previous fix for Bug #4378
'"create database IF NOT EXISTS thing" returns an error'
)


sql/sql_db.cc:
  manual merge 
  (
  changed length in mysql_create_db to path_len
  so as it was calculated in the first unpack_dirname
  in my previous fix for Bug #4378
  '"create database IF NOT EXISTS thing" returns an error'
  )

as after effect of fix for Bug #4378 
'"create database IF NOT EXISTS thing" returns an error' 

(avoided an unpack_dirname and 
 changed strcat into strmake)


sql/sql_db.cc:
  added an optimization in mysql_create_db 
  (avoided an unpack_dirname and 
   changed strcat into strmake)

  fix MYI copying with scp
  safer tempfile creation


scripts/mysqlhotcopy.sh:
  fix MYI copying with scp
  safer tempfile creation

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

Some bug fixes to last pushed code


mysql-test/mysql-test-run.sh:
  Fix for new valgrind (2.1.1)
mysql-test/r/bdb.result:
  Updated results
mysql-test/t/ps_1general.test:
  removed wrong error condition
sql/ha_berkeley.cc:
  Fix for index_flags() in new code
sql/item_strfunc.cc:
  Cleanup (fixed indentation, removed short variable names)
sql/mysql_priv.h:
  Cleanup of db option cacheing
sql/mysqld.cc:
  Cleanup of db option cacheing
sql/sql_db.cc:
  Cleanup of db option cacheing
sql/sql_parse.cc:
  Cleanup of db option cacheing
sql/sql_table.cc:
  sprintf -> strxmov
sql/table.cc:
  key_read should be tested on key parts, not the whole key

Build-tools/Bootstrap:
  Auto merged
Build-tools/Do-compile:
  Auto merged
mysql-test/r/lowercase_table2.result:
  Auto merged
mysql-test/r/system_mysql_db.result:
  Auto merged
mysql-test/r/system_mysql_db_refs.result:
  Auto merged
mysql-test/t/system_mysql_db_fix-master.opt:
  Auto merged
mysql-test/t/system_mysql_db.test:
  Auto merged

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

  Define cxa_pure_virtual to print error message and DBUG_ASSERT:
  calls to pure virtual methods should not go unnoticed.


include/my_global.h:
  Define cxa_pure_virtual to print error message and DBUG_ASSERT:
  calls to pure virtual methods should not go unnoticed.

  Call my_md5sum with path


Build-tools/Do-compile:
  Call my_md5sum with path