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


sql/sql_parse.cc:
  Auto merged

into  mysql.com:/usr/home/bar/mysql-5.0


mysys/charset.c:
  Auto merged

  Bug#13238 mysqldump and mysqladmin hangs
  Avoid recursion into init_available_charsets.
  Serg's version didn't work for me: I got 
  double mutex locking.
  Pushing this version instead
  (It was approved by Serg anyway)


mysys/charset.c:
  Bug#13238 mysqldump and mysqladmin hangs
  Avoid recursion into init_available_charsets.
  Serg's version didn't work for me: I got 
  double mutex locking.
  Pushing this version instead
  (It was approved by Serg anyway)

into  mysql.com:/home/jimw/my/mysql-5.0-clean


mysql-test/my_manage.c:
  Auto merged
mysql-test/mysql_test_run_new.c:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
mysql-test/r/variables.result:
  Resolve conflicts
mysql-test/t/variables.test:
  Resolve conflicts
sql/sql_acl.cc:
  Resolve conflicts
strings/ctype-simple.c:
  Resolve conflicts
strings/ctype-ucs2.c:
  Resolve conflicts

into  mysql.com:/home/emurphy/src/bk-clean/mysql-5.0

into  mysql.com:/home/emurphy/src/bk-innodb/mysql-5.0


innobase/include/rem0rec.h:
  Auto merged
innobase/include/rem0rec.ic:
  Auto merged
innobase/row/row0upd.c:
  Auto merged

into  mysql.com:/home/alexi/dev/mysql-4.1-4375

Applying InnoDB patch from Jan Lindstrom

 during replication.
 Modified my_dir(). Now this function skips hidden and system
 files which sometimes are created by Windows.
 NOTE. The fix is similar to the previuos one (05 July 2004)
 except for correct setting of the 'attrib' variable value
 (within the previous fix this variable was left uninitialized
 when my_dir() was called with My_flags & MY_WANT_STAT == 0).


mysys/my_lib.c:
  Modified my_dir().
   Now this function skips hidden and system files
   which sometimes are created by Windows.

without database"


mysql-test/r/sp-error.result:
  Test results fixed (a test case for Bug#13587)
mysql-test/t/sp-error.test:
  A test case for Bug#13587 "Server crash when SP is created without 
  database"
sql/sql_parse.cc:
  - move initialization of lex->sphead->m_db before it's used.
  - cleanup; comment why right now can't be cleaned any more

into mysql.com:/home/psergey/mysql-5.0-bug12915-merge

into  krsna.patg.net:/home/patg/mysql-build/mysql-5.0.test2

  Changed option text in mysqldump.c
mysqldump.c:
  Changed text to read "+00:00" as opposed to "UTC" (per what the code does)


client/mysqldump.c:
  Changed text to read "+00:00" as opposed to "UTC" (per what the code does)

into  krsna.patg.net:/home/patg/mysql-build/mysql-5.0.test1

into  krsna.patg.net:/home/patg/mysql-build/mysql-5.0.test1

sql/ha_federated.cc:
  Re-application of patch from earlier, adding debug to create_where_from_key as well 
  as small bug fix for setting of records and deleted in delete_all_rows to after db call.

into  zim.(none):/home/brian/mysql/mysql-5.0

mysql-test/r/archive.result:
  Result file for adding check table support
mysql-test/t/archive.test:
  Simple test for check table. The additional select is added just to make sure the file is not destroyed.
sql/ha_archive.cc:
  Updates for adding CHECK table support. is_crashed() now returns the state of the file.
sql/ha_archive.h:
  Updates for adding CHECK table support

mysql-test/r/update.result:
  Auto merged
mysql-test/t/update.test:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/records.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/structs.h:
  Auto merged

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

into  mysql.com:/home/cps/mysql/trees/mysql-5.0-build

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

into  regul.home.lan:/mnt/md/bk/mysql-5.0

use USE_PRAGMA_INTERFACE before include of my_global.h,
where it is defined


server-tools/instance-manager/command.h:
  don't use USE_PRAGMA_INTERFACE before my_global.h, where it is defined
server-tools/instance-manager/listener.h:
  don't use USE_PRAGMA_INTERFACE before my_global.h, where it is defined
server-tools/instance-manager/mysql_connection.h:
  don't use USE_PRAGMA_INTERFACE before my_global.h, where it is defined
server-tools/instance-manager/options.h:
  don't use USE_PRAGMA_INTERFACE before my_global.h, where it is defined
server-tools/instance-manager/thread_registry.cc:
  fix register
server-tools/instance-manager/thread_registry.h:
  don't use USE_PRAGMA_INTERFACE before my_global.h, where it is defined
server-tools/instance-manager/user_map.h:
  don't use USE_PRAGMA_INTERFACE before my_global.h, where it is defined

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

mysql-test/r/skip_grants.result:
  creation view with DEFINER clause if --skip-grant-tables
mysql-test/t/skip_grants.test:
  creation view with DEFINER clause if --skip-grant-tables
sql/sql_acl.cc:
  check of ACL initialization in is_acl_user()

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

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


sql/mysqld.cc:
  Auto merged

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

Added initial support of stress testing. Now it is possible to start stress test from mysql-test-run script.
For details see README.stress 

into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1

mysql-test/my_manage.c:
  Avoid warning: i not used in case of Windows.
mysql-test/mysql_test_run_new.c:
  Removed unused variable.
sql/item_func.cc:
  Removed unused variables.
strings/ctype-simple.c:
  Added cast.
strings/ctype-ucs2.c:
  Added cast.

into  mysql.com:/home/emurphy/src/bk-clean/mysql-5.0

sql/sql_show.cc:
  1. Use Field_longlong::store(longlong nr, bool unsigned_val) for ulonglong values
     instead of Field_longlong::store(double nr).
  2. CHARACTER_OCTET_LENGTH and CHARACTER_MAXIMUM_LENGTH fields filing order fixed (8 <-> 9).

into mysql.com:/home/psergey/mysql-4.1-bug12915-r2


sql/sql_update.cc:
  Auto merged

  'information_schema' is excluded from list of databases for mysqlcheck command


mysql-test/mysql-test-run.pl:
  dded support for 'mysqlcheck'
mysql-test/mysql-test-run.sh:
  dded support for 'mysqlcheck'