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

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


mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged

scripts/mysql_install_db.sh:
  Merge changes

mysql-test/mysql-test-run.sh:
  In a release build on the platforms, TESTS_BINDIR needs to be set to $BASEDIR/tests because the test 
  program 'client_test' is expected there (see 'client_test.test' with its 'exec', bug#7909).
  In an installation, TESTS_BINDIR needs to be set to $BASEDIR/bin because some NDB programs are 
  located there (see Jonas Oreland's change labeled '1.220, 2005-01-04 08:15:30+01:00').
  This patch is to unite these conflicting requirements.

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

pack_length_in_rec() func has been introduced.


sql/field.h:
  A fix for bit type. 
  As from now the pack_length_in_rec() function is used for MyISAM 
  record length calculation instead of the pack_length().
  For bit field it doesn't count uneven bits.
sql/ha_myisam.cc:
  A fix for bit type. 
  As from now the pack_length_in_rec() function is used for MyISAM 
  record length calculation instead of the pack_length().
  For bit field it doesn't count uneven bits.

This completes the patch for fast TRUNCATE TABLE.


innobase/dict/dict0boot.c:
  dict_boot(): Add page_no parameter to dict_index_add_to_cache()
innobase/dict/dict0crea.c:
  Remove dict_index_t:page_no; add ind_node_t:page_no
innobase/dict/dict0dict.c:
  dict_index_add_to_cache(): Add parameter page_no
  dict_tree_create(): Add parameter page_no
innobase/dict/dict0load.c:
  dict_load_indexes(): Add page_no to dict_index_add_to_cache() call
innobase/ibuf/ibuf0ibuf.c:
  ibuf_data_init_for_space(): Move page_no to dict_index_add_to_cache()
innobase/include/dict0crea.h:
  ind_node_t: Add page_no field
innobase/include/dict0dict.h:
  dict_index_add_to_cache(): Add page_no
  dict_tree_create(): Add page_no
innobase/include/dict0mem.h:
  dict_index_t: Remove page_no, as dict_tree_t has "page" field
innobase/row/row0mysql.c:
  row_truncate_table_for_mysql(): Improve the comments

into hundin.mysql.fi:/home/marko/j/mysql-5.0


innobase/include/row0mysql.h:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_innodb.h:
  Auto merged

additional fix for cp932 and eucjpms, recently implemented by
Shuichi.

engine, except when running with sql_mode & MYSQL323. (Bug #6659)


mysql-test/r/create.result:
  Fix test results
mysql-test/r/ctype_utf8.result:
  Fix test results
mysql-test/r/information_schema.result:
  Fix results
mysql-test/r/show_check.result:
  Fix results
sql/ha_heap.h:
  Output 'HEAP' in MySQL 3.23 compatibility mode
mysql-test/r/heap.result:
  Update results
mysql-test/r/sql_mode.result:
  Update results

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

it has been specified. (Bug #7347)


scripts/mysql_install_db.sh:
  When basedir is specified, look for libexecdir relative to that

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