into arthur.local:/my/mysql-5.0-clean

into mysql.com:/home/jimw/my/mysql-5.0-clean


mysql-test/r/ctype_utf8.result:
  Auto merged
sql/field.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged

mysql-test/r/ctype_utf8.result:
  Update results
mysql-test/r/show_check.result:
  Update results

into mysql.com:/home/jimw/my/mysql-5.0-clean

  "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"


sql/ha_innodb.cc:
  Add a comment why data modifying SQL statements MUST always use a locking read in tables that they read: otherwise the exxecution is not serializable, and in many cases is not well-defined; 5 minutes ago we merged the associated bug fix from 4.0 and 4.1

into arthur.local:/my/mysql-5.0-clean

into mysql.com:/home/jimw/my/mysql-5.0-clean

into mysql.com:/home/jimw/my/mysql-4.1-clean

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


innobase/os/os0file.c:
  Auto merged
sql/ha_innodb.cc:
  Auto merged

  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


sql/ha_innodb.cc:
  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

mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/t/show_check.test:
  Auto merged
sql/sql_show.cc:
  Merge with s/TYPE/USING/ fixes

innobase/os/os0file.c:
  Auto merged
sql/ha_innodb.cc:
  SCCS merged

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

into mysql.com:/home/jimw/my/mysql-4.1-clean


mysql-test/r/ctype_utf8.result:
  Auto merged
sql/sql_show.cc:
  Auto merged

key algorithm for keys where they were explicitly specified.


mysql-test/r/show_check.result:
  Add results
mysql-test/t/show_check.test:
  Add tests for preservation of key algorithm in SHOW CREATE TABLE output

  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


sql/ha_innodb.cc:
  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

BitKeeper/etc/ignore:
  auto-union
innobase/os/os0proc.c:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
extra/comp_err.c:
  SCCS merged

into mysql.com:/home/jimw/my/mysql-5.0-clean


sql/ha_berkeley.cc:
  Auto merged

into mysql.com:/home/jimw/my/mysql-5.0-clean


mysql-test/r/type_float.result.es:
  Auto merged
mysql-test/r/type_float.result:
  Auto merged
sql/field.cc:
  Auto merged

into mysql.com:/home/jimw/my/mysql-4.1-clean

into mysql.com:/home/jimw/my/mysql-4.1-clean


sql/field.cc:
  Auto merged

file closing in extra/comp_err.c


BitKeeper/etc/ignore:
  added extra/mysqld_ername.h
extra/comp_err.c:
  Added proper closing of the file.
innobase/os/os0proc.c:
  Fixed small bug in innodb.

sql/ha_innodb.cc:
  Fix valgrind warning.
strings/ctype-uca.c:
  Fix C++ style comments.

mysql-test/r/ctype_latin1_de.result:
  Auto merged
mysql-test/r/ctype_tis620.result:
  Auto merged
mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/r/ctype_ujis.result:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/filesort.cc:
  Auto merged
strings/ctype-big5.c:
  Auto merged
strings/ctype-bin.c:
  Auto merged
strings/ctype-czech.c:
  Auto merged
strings/ctype-gbk.c:
  Auto merged
strings/ctype-latin1.c:
  Auto merged
strings/ctype-mb.c:
  Auto merged
strings/ctype-simple.c:
  Auto merged
strings/ctype-sjis.c:
  Auto merged
strings/ctype-tis620.c:
  Auto merged
strings/ctype-uca.c:
  Auto merged
strings/ctype-ucs2.c:
  Auto merged
strings/ctype-utf8.c:
  Auto merged
strings/ctype-win1250ch.c:
  Auto merged

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"


configure.in:
  - bumped up the version number from 4.1.9 to 4.1.10

  (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


Build-tools/Do-compile:
  - added option "--with-federated" to enable building of the Federated
    Storage Engine (as requested by Brian)
support-files/mysql.spec.sh:
  - enabled the federated storage engine for the Max RPM subpackage

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