into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb-merge

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1

bug #5872, transactions should only be restarted with transaction.on flag off if execute_commit has been performed
added testcase for this
use force send for all executes

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb-merge

switch to using my_ for heap allocations

  ctype_recode does not hang anymore. Small fix after Marko's change.

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb

  typos in comment.

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1

into goetia.(none):/home/dellis/mysqlab/bk/mysql-4.1

  BUG #5831 Changed mysql_revoke_all() to successfully delete all privileges for a user in one pass.

  A partial bugfix to a multibyte charset / column prefix index bug: my_charpos() does not handle right some cases, we try to mask the bug for ASCII chars < 128 in the UTF-8 charset

  Remove accidentally pushed fsp debug code

into hundin.mysql.fi:/home/heikki/mysql-4.1

  Fix bug introduced by the prefix key + multibyte charsets patch today

into mysql.com:/users/kboortz/daily/work/mysql-4.1-vax

  Temporarely disabled client_test test
  Use MASTER_MYSOCK to get socket path

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1

Fix for bug#5782: Don't choose the plan that accesses table with index_prev if the handler doesn't support it (see also ChangeSet@1.2039)

into mysql.com:/home/dlenev/src/mysql-4.1-ryan

column types TIMESTAMP is NOT NULL by default, so in order to have 
TIMESTAMP column holding NULL valaues you have to specify NULL as
one of its attributes (this needed for backward compatibility).

Main changes:
Replaced TABLE::timestamp_default_now/on_update_now members with
TABLE::timestamp_auto_set_type flag which is used everywhere
for determining if we should auto-set value of TIMESTAMP field 
during this operation or not. We are also use Field_timestamp::set_time()
instead of handler::update_timestamp() in handlers.

into goetia.(none):/home/dellis/mysqlab/bk/mysql-4.1

into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1

  Logging to logging@openlogging.org accepted
sql_acl.cc, grant.test, grant.result:
  BUG 5831 Changed mysql_revoke_all() to successfully delete all privileges for a user in one pass.

into hundin.mysql.fi:/home/marko/j/mysql-4.1