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

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

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

Cleanup of mi_print_error() handling
Deleted 'merge' directory

  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

  added syntax:
  'show variables where', 'show status where', 'show open tables where'

new-style InnoDB tables. (Bug #7578)

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

robustness (dropping things just in case).

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

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

    test_d2b2d("123.4", 10, 2, "123.40");

into mysql.com:/M50/mysql-5.0

This is a partial solution for bug#7464.

  tabs replaced
ha_innodb.cc:
  Comments removed

  Logging to logging@openlogging.org accepted
sql_yacc.yy, sql_parse.cc, sql_lex.h, lex.h:
  Implements the SHOW MUTEX STATUS command
set_var.cc, mysqld.cc, mysql_priv.h:
  Added new GLOBAL variable timed_mutexes
ha_innodb.h:
  New function innodb_mutex_show_status
ha_innodb.cc:
  Added new innodb variables in SHOW STATUS
  Implements the SHOW MUTEX STATUS command
innodb.test, innodb.result:
  Added new row_lock_waits status variables tests.
variables.test, variables.result:
  test new variable timed_mutexes
ut0ut.c:
  New function ut_usectime.
sync0sync.c:
  Mutex counting.
sync0rw.c:
  New mutex parameters initialization.
srv0srv.c:
  Counting row lock waits
row0sel.c, row0mysql.c:
  Setting row_lock or table_lock state to thd.
que0que.c:
  Added default no_lock_state to thd.
univ.i:
  Added UNIV_SRV_PRINT_LATCH_WAITS debug define
sync0sync.ic:
  Count mutex using.
sync0sync.h:
  Added new parameters to mutex structure for counting.
sync0rw.h:
  Added new parameters to rw_create_func.
srv0srv.h:
  Added new innodb varuables to SHOW STATUS.
que0que.h:
  Added thread lock states.

into mysql.com:/home/mydev/mysql-5.0-wl2126

Added the required structures and functions for
handing over multiple key ranges to the table handler.

Changed my_error() to print error messages, which come from
arbitrary registered ranges of error messages. Messages can
be unregistered (and should be at end of the program).
Added registration of handler error messages.
Added a new mi_print_error() macro and a new 
mi_report_error() function, which supply error
messages with a table name.
Added calls to mi_print_error() or mi_report_error()
at all places in MyISAM, where table corruption is detected.

into pcgem.rdg.cyberkinetica.com:/usr/home/acurtis/work/wl925.4

  Implement fine-grained control over access to stored procedures
  Privileges are cached (same way as existing table/column privs)