(Old code failed for INSERT ... ON DUPLICATE with prepared statements) 
Instead, always reset table->insert_values on open.

Portability fixes

(this depends on s[n]printf implementation and differs from system to system)

  Removed references to ISAM and MERGE

  Removed references to ISAM and MERGE

  Removed references to ISAM and MERGE

into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0

  Manually merge the little InnoDB bug fix from 4.1 to 5.0; Marko can then run tests on the fixed version

into mysql.com:/home/psergey/mysql-5.0-debug-31dec

into mysql.com:/dbdata/psergey/mysql-5.0-build-fix-31dec

Now max_user_connections is 36th field in mysql.user table
(two new SP-related privileges were added).

into mysql.com:/home/dlenev/src/mysql-5.0-1339

into mysql.com:/dbdata/psergey/mysql-5.0-build-fix-31dec

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

This fixes a bug found by bdb.test
Fixes a portability issue with bdb tables

into mysql.com:/Users/mikron/mysql-5.0

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

into intelp4d.mysql.com:/users/vtkachenko/bk/mysql-5.0

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

into mysql.com:/home/my/mysql-merge

Cleanup of mi_print_error() handling
Deleted 'merge' directory

Caused a hard limit of 64 unique indexes in cluster

  page_dir_find_owner_slot(): Fix bug in corruption diagnostics.

  row_upd_clust_rec(): Call btr_cur_get_rec() after
  btr_pcur_restore_position(), not before.  (Bug #7598)

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

rem0rec.c:
  rec_init_offsets(): Make the function comment more accurate.
rem0rec.ic:
  rec_get_nth_field(): Return pointer to the field, even to NULL fields.
  rec_set_nth_field(): Make more accurate debug assertions.

into mysql.com:/home/cps/mysql/trees/mysql-5.0

into mysql.com:/home/cps/mysql/trees/mysql-5.0