"Add a comment why data modifying SQL statements MUST always use a locking read in tables that they read: otherwise the execution is not serializable, and in many cases is not well-defined; we also merged the associated bug fix from 4.1"

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

  Merge from 4.0:     Fix a theoretical hang over the adaptive hash latch in InnoDB if one runs INSERT ... SELECT ... (binlog not enabled), or a multi-table UPDATE or DELETE, and only the read tables are InnoDB type, the rest are MyISAM; this also fixes bug #7879 for InnoDB type tables

into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0

  Fix a theoretical hang over the adaptive hash latch in InnoDB if one runs INSERT ... SELECT ... (binlog not enabled), or a multi-table UPDATE or DELETE, and only the read tables are InnoDB type, the rest are MyISAM; this also fixes bug #7879 for InnoDB type tables

into mysql.com:/space/my/mysql-4.1

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

- tagged ChangeSet 1.2207 as "mysql-4.1.9"

  (we should consider dropping 3.23 from this one soon)

into mysql.com:/space/my/mysql-5.0-build

into gluh.mysql.r18.ru:/home/gluh/MySQL-BUGS/mysql-5.0

on whether running with or without valgrind.

  Federated Storage Engine (as requested by Brian)
- added the federated storage engine to the Max Linux RPM

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

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

into mysql.com:/home/jonas/src/mysql-5.0

into mysql.com:/home/jonas/src/mysql-5.0

into mysql.com:/home/jonas/src/mysql-4.1

into build.mysql.com:/users/tulin/mysql-5.0-ndb

into mysql.com:/home/jonas/src/mysql-5.0-ndb

into here.mwagner.org:/Users/mwagner/work/bk/mysql-5.0

  Use the invisible tabs (!)

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

  Fix test result affected by error message rewording.
errmsg.txt:
  Reword error messages.
set_var.cc:
  Reorder variables.
mysqld.cc:
  Reorder options.

into here.mwagner.org:/Users/mwagner/work/bk/mysql-5.0

  Add missing 'get_defaults_files' to fix linking error.