myisam/mi_create.c:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_parse.cc:
  merged with ul

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


acinclude.m4:
  Auto merged
mysql-test/r/ps_1general.result:
  Auto merged

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

sql/sql_acl.cc:
  don't use acl_cache for GRANT
sql/sql_parse.cc:
  fixed backporting error in "backport wild_compare fix from 4.1 - bug#3924"

provide created shared memory objects with proper
access rights to make them usable when client and server
are running under different accounts. 
Post review fixes.


VC++Files/mysys/mysys.dsp:
  Add my_windac.c to mysys.lib
include/my_sys.h:
  Declarations for SECURITY_ATTRIBUTES create/destroy functions.
mysys/Makefile.am:
  Add my_windac.c to the list of compiled files.
sql-common/client.c:
  Lower requested access rights for events as the server won't 
  provide clients with ALL access in order to prevent denial
  of service attack.
sql/mysqld.cc:
  Set proper security attributes for the kernel objects to make them
  usable when mysqld is running as a Windows service.

libmysqld/Makefile.am:
  Adding ha_blackhole.cc

mysql-test/r/ps_1general.result:
  Fix test case.
sql/handler.h:
  Added federated to the list so that any beta users won't end up with a mismatch for table enum

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

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

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

  Don't run GBK test if not GBK support was compiled.


tests/mysql_client_test.c:
  Don't run GBK test if not GBK support was compiled.

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


configure.in:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged

acinclude.m4:
  Change in message
mysql-test/r/blackhole.result:
  Lowered the number of inserts.
mysql-test/t/blackhole.test:
  Lowered the number of inserts.
sql/ha_blackhole.cc:
  Added indexes per Serg, correction of indention, added asserts per Serg.
sql/ha_blackhole.h:
  Indention fix, added methods for index...

into neptunus.(none):/home/msvensson/mysql/mysql-4.1

  Wrong help string fix.


myisam/myisamchk.c:
  Wrong help string fix.

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

in some cases, because "charset(x) = 'string'" was considered
as "x is not null" due to incorrect not_null_tables().

into neptunus.(none):/home/msvensson/mysql/bug9303

mysql-test/r/type_blob.result:
  Test creates a blob(250 whcih is now displayed as tinyblob when SHOW COLUMNS is called.
sql/sql_parse.cc:
  Added missing else so that FIELD_TINY_BLOB can be selected

into neptunus.(none):/home/msvensson/mysql/mysql-4.1


sql/mysqld.cc:
  Auto merged

    followup - results fixed


mysql-test/r/ps_6bdb.result:
  followup - results fixed

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

acinclude.m4:
  clarify help text

    corrected number of fields for --enable_metadata
sql/sql_union.cc
    fixed a apparent typo in assert


client/mysqltest.c:
  corrected number of fields for --enable_metadata
mysql-test/r/metadata.result:
  corrected number of fields for --enable_metadata
mysql-test/r/ps_1general.result:
  corrected number of fields for --enable_metadata
mysql-test/r/ps_2myisam.result:
  corrected number of fields for --enable_metadata
mysql-test/r/ps_3innodb.result:
  corrected number of fields for --enable_metadata
mysql-test/r/ps_4heap.result:
  corrected number of fields for --enable_metadata
mysql-test/r/ps_5merge.result:
  corrected number of fields for --enable_metadata
mysql-test/r/type_enum.result:
  corrected number of fields for --enable_metadata
sql/sql_union.cc:
  fixed a apparent typo in assert

into quadita2.mysql.com:/nfstmp1/guilhem/mysql-4.1-4ita

"After Monty's review" changes to the fix for BUG#8325 "Deadlock in replication thread stops replication":
s/sleep/safe_sleep (thread safe); sleep 0/1/2/3/4/5/5/5 (get slave less late);
no message on error log (deadlock is too common sometimes), a global counter
instead (SHOW STATUS LIKE 'slave_retried_transactions').
Plus a fix for libmysql/Makefile.shared


libmysql/Makefile.shared:
  When we "make clean" in libmysql/ we remove the symlinks there, so we
  need to mark that they have to be recreated later: this is done by removing
  ../linked_libmysql_sources. If we don't do this, 'make' will fail after 'cd libmysql;make clean'.
  This Makefile.shared is used by libmysql_r too.
  No reason to remove linked_client_sources as we don't remove the links in client/.
mysql-test/r/rpl_deadlock.result:
  result fix
mysql-test/t/rpl_deadlock.test:
  small test addition
sql/mysqld.cc:
  if active_mi could not be alloced, die. New SHOW STATUS LIKE "slave_retried_transactions".
sql/slave.cc:
  If slave retries automatically a transaction, no message on error log
  (too common situation); sleep 0 secs at first retry, then 1, 2, 3, 4,
  5, 5, 5... Sleeping 0 is to get the least possible late, as deadlocks
  are usually resolved at first try. New global counter rli->retried_trans
  (for SHOW STATUS: total number of times the slave had to retry
  any transaction). safe_sleep() is thread-safe, sleep() was not.
  I change the rli->trans_retries counter to go from 0 to max instead
  of the other way (better for new sleep()).
sql/slave.h:
  new global counter rli->retried_trans
sql/sql_show.cc:
  SHOW STATUS LIKE "slave_retried_transactions"; needs replication mutexes.
  Can't be a simple SHOW_LONG, because active_mi is unset (not alloced yet)
  when the static global status_vars is created (active_mi is set
  in init_slave()).
sql/structs.h:
  new SHOW_SLAVE_RETRIED_TRANS
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

  Fix typo.


mysql-test/README:
  Fix typo.

into neptunus.(none):/home/msvensson/mysql/mysql-4.1

Additional storage engine called "blackhole". Customer request, and for that matter a Zawodny request.  With this you can alter table to a type of table that would never store data. Its a /dev/null for a database.  


acinclude.m4:
  New macro rule for ha_blackhole.
configure.in:
  Rule enabling blackhole engine
sql/Makefile.am:
  Additions to Makefile for blackhole engine
sql/handler.cc:
  Ifdef enable code for blackhole (and message for "what does this thing do").
sql/handler.h:
  Flag for storage engine type.
sql/mysql_priv.h:
  Added blackhole type.
sql/mysqld.cc:
  Updates for building backhole.
sql/set_var.cc:
  Show variable for blackhole engine

bdb/hash/hash_open.c:
  Fix order of arguments to memset()
bdb/btree/bt_open.c:
  Fix order of arguments to memset()
ndb/src/kernel/vm/VMSignal.cpp:
  Fix order of arguments to memset()

Added better comment for perceived problem with fix for Bug #8753 Invalid schema object version after dropping index

Extra fix for perceived problem with fix for Bug #8753 Invalid schema object version after dropping index

into neptunus.(none):/home/msvensson/mysql/mysql-4.1

into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl


mysql-test/mysql-test-run.sh:
  Auto merged

  InnoDB needs longer start time for second slave on slow hosts


mysql-test/mysql-test-run.pl:
  InnoDB needs longer start time for second slave on slow hosts
mysql-test/mysql-test-run.sh:
  InnoDB needs longer start time for second slave on slow hosts

into neptunus.(none):/home/msvensson/mysql/mysql-4.1