into sinisa.nasamreza.org:/mnt/work/mysql-4.1

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

  Print a hex dump of the trx_t object if trx->n_mysql_tables_in_use != 0 at trx_free()

  added skip-ndbcluster switch

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

into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-4.1

into mysql.com:/M41/mysql-4.1

object version after dropping index

dumped with --hex-blob and --skip-extended-insert options.

  Logging to logging@openlogging.org accepted
func_group.result, func_group.test:
  Added a test case for bug #8893.
opt_sum.cc:
  A misplaced initialization for the returned parameter
  prefix_len in the function find_key_for_maxmin caused
  usage of a wrong key prefix by the min/max optimization
  in cases when the matching index was not the first index
  that contained the min/max field.

  If InnoDB cannot allocate memory, keep retrying for 60 seconds before we crash mysqld; maybe the memory shortage is just temporary

  Do not assert, but print diagnostics if MySQL tries to free a trx where n_mysql_tables_in_use > 0

  write_row(): Detect SQLCOM_OPTIMIZE, so that also OPTIMIZE TABLE
  will commit at every 10,000 copied rows.

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

  fixing test results accordingly.
func_system.test:
  New test that illegal mix of collations does not happen anymore.
item_strfunc.h:
    safe_charset_converter() was added for system constants.
item_strfunc.cc:
  safe_charset_converter() was added for system constants.
item_func.cc, item.h, item.cc:
  Bug#8291: Illegal collation mix with USER() function.
  After discussion with PeterG and Serge, a new coercibility
  level for "system constants" was introduced, between
  COERRIBLE and IMPLICIT. Thus:
  SELECT col1 = USER() FROM t1; - is done according to col1 collation.
  SELECT 'string' = USER(); - is done according to USER() collation.
  At the same time, "nagg" and "strong" members were removed as unused.
item_create.cc:
  Version is a system constant too.

to 'libmysql/net.c'.

into mysql.com:/home/mydev/mysql-4.1-4100

into mysql.com:/home/mydev/mysql-4.1-4100

Added a missing comma.

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

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