Call mark_as_null_row in join_read_const and join_read_system.

into hundin.mysql.fi:/home/marko/k/mysql-4.0

  Fix for the 0xA0 character problem in the InnoDB FOREIGN KEY parser: if my_isspace() treats 0xA0 as space, then let InnoDB do the same; this might break some multi-byte charset id's, though for big5, ujis, sjis this seems not to change the current behavior (I checked the tables in /share/charsets); this fix must NOT be merged to 4.1 because in 4.1 everything is in UTF-8

  srv_printf_innodb_monitor(): Removed extraneous rewind() call.
  The caller of this function calls rewind() if necessary.
  In this way, we avoid rewind()ing stderr in
  srv_lock_timeout_and_monitor_thread().

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

insertion of new records partially failed. It would get logged because of the
logic to log a partially-failed 'INSERT ... SELECT' (which can't be rolled back
in non-transactional tables), but 'CREATE TABLE ... SELECT' is always rolled
back on failure, even for non-transactional tables. (Bug #6682)
(Original fix reimplemented after review by Serg and Guilhem.)

two-line fix for BUG#6732 "FLUSH TABLES WITH READ LOCK + COMMIT makes next FLUSH...LOCK hang forever"
(originally reported as "second run of innobackup hangs forever and can even hang server").
Plus testcase for the bugfix and comments about global read locks.

  srv_lock_timeout_and_monitor_thread(): write to srv_monitor_file
  only if --innodb_status_file=1

(Cleanups and better bug fixes)

into mysql.com:/home/timka/mysql/src/4.0-master

into mysql.com:/space/bk/b6148-mysql-4.0

slave SQL thread is started.

to run the standard tests with "--force" (default, can be switched off).

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

  bug#6705 - (+trunc1* +trunc2*)
fulltext.test, fulltext.result:
  bug#6705

into mysql.com:/home/dlenev/src/mysql-4.0-bg6439

When mysqlbinlog prints LOAD DATA INFILE, let it print the thread id. Some customer would have benefited
much from this in his recovery. All this change does is adding one commented (#) line before the LOAD DATA
command, so it is quite innocuous.

  Fix InnoDB bug #6287: if one uses INSERT IGNORE to insert several rows at a time, and the first inserts are ignored because of a duplicate key collision, then InnoDB in a replication slave assigns AUTO_INCREMENT values 1 bigger than in the master

values for too big argument".

Added range checking for from_unixtime() argument, cleaned up code 
a bit.

were stopping at docid 0xffffffff

  Add -acc flag for texi2html to handle accented characters.

into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b6564

  Prevent creation of a row which grants no rights
  Test included

into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.0

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

When we are writing a transaction to the binlog, we log BEGIN/COMMIT with zero error code.
Example: all statements of trans succeeded, connection lost and so implicit rollback:
we don't want ER_NET* errors to be logged in the BEGIN/ROLLBACK events, while statement
events have 0. If there was really a serious error code, it's already in the statement events.

Revise the --hex-blob help message string. (This will need
revising after merge to 4.1, too, but the CHAR BINARY and
VARCHAR BINARY data types will be BINARY and VARBINRY.)

  Adding a prototype for the new function.

--defaults-extra-file option.