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.

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)
  

changed field names in 'collations' table(discussed with PGulutzan)

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

This fix icludes workaround for Irix compiler bug & removs some unused
variables (resulted in warnings)