into mysql.com:/home/timka/mysql/src/4.1-dbg

Fix for BUG#7377. This fix adds the same implementation for ha_myisammgr::index_type as in version 5.0.

  Return a sensible error code from DISCARD TABLESPACE, if it fails because the table is referenced by a FOREIGN KEY

  Return a sensible error code from DISCARD TABLESPACE, if it fails because the table is referenced by a FOREIGN KEY

  Fix typo

  Correct typo

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

  Fix InnoDB critical bug #7496; we scan the InnoDB data dictionary also at a normal mysqld startup, and create the spaces, so that we know the mapping space id -> .ibd file name; fix an infinite loop if DISCARD TABLESPACE coincides with INSERT or some other table operation; fix a potential crash if DISCARD TABLESPACE coincides with a cascaded FOREIGN KEY operation in the same table; do not allow DISCARD TABLESPACE of a referenced table if FOREIGN_KEY_CHECKS=1

into rurik.mysql.com:/home/igor/dev/mysql-4.1-0

  Added a couple of new test cases for bug #7351.

  Added test cases for bug #7351.
item_cmpfunc.cc:
  Fixed bug #7351: incorrect result for a query with a
  subquery returning empty set.
  If in the predicate v IN (SELECT a FROM t WHERE cond)
  v is null, then the result of the predicate is either
  INKNOWN or FALSE. It is FALSE if the subquery returns
  an empty set.
item_subselect.cc:
  Fixed bug #7351: incorrect result for a query with a
  subquery returning empty set.
  The problem was due to not a quite legal transformation
  for 'IN' subqueries. A subquery containing a predicate
  of the form
  v IN (SELECT a FROM t WHERE cond)
  was transformed into
  EXISTS(SELECT a FROM t WHERE cond AND (a=v OR a IS NULL)).
  Yet, this transformation is valid only if v is not null.
  If v is null, then, in the case when
  (SELECT a FROM t WHERE cond) returns an empty set the value
  of the predicate is FALSE, otherwise the result of the
  predicate is INKNOWN.
  The fix resolves this problem by changing the result
  of the transformation to
  EXISTS(SELECT a FROM t WHERE cond AND (v IS NULL OR (a=v OR a IS NULL)))
  in the case when v is nullable.
  The new transformation prevents applying the lookup
  optimization for IN subqueries. To make it still
  applicable we have to introduce guarded access methods.

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

user limits to behave well on 5.0 tables, into 4.1 tree.

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

to behave well on 5.0 tables (well now you can't use tables from 4.1
and 5.0 with 4.0 because former use utf8, but still it is nice to have
similar code in acl_init() and replace_user_table()).
This also will make such GRANTs working in 5.0 (they are broken now).

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

into mysql.com:/home/wax/mysql/mysql-4.1smemory

add space after comma
add space after equal
add comments in vio_close_shared_memory()

from the install directory.

into mysql.com:/home/wax/mysql/mysql-4.1smemory

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

    don't checkin for Administrator or mysqldev
sql/log.cc@1.157
    restored a bugfix that was lost in a merge

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

decided for fixed size buffers in LogHandler repeated messages

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

STR_TO_DATE() function if there is another format specifier after %f 
in format string". Also small cleanup of STR_TO_DATE() implementation.
(After review version.)

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

changed name of g_eventLogger so it can be used in TransporterRegistry and is the same as in the kernel

into mysql.com:/space/pekka/ndb/version/my41