don't fail w/o bdb (or innodb)
sql/sql_base.cc
    typo fixed.
    "mysql-test-run --ps-protocol select" fixed (item->cached_item was set to the last table if many matches)

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

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

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

into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0

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

  updated ndb version number

into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0

Portability fixes

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

into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0

  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