* Removed unused parameters 
 * Fixed several cost calculation errors in ror_intersect_add
 * Better code structure for ror_intersect_add and get_best_ror_intersect

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

pack_length_in_rec() func has been introduced.

This completes the patch for fast TRUNCATE TABLE.

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

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

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

it has been specified. (Bug #7347)

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

  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

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

key algorithm for keys where they were explicitly specified.

  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:/home/jimw/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 mysql.com:/home/jimw/my/mysql-4.1-clean

file closing in extra/comp_err.c

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

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