into  mysql.com:/home/alexi/innodb/mysql-5.0-merge

  Fixed bugs:
  #16814: SHOW INNODB STATUS format error in LATEST FOREIGN KEY ERROR section
    dict_foreign_key_error_report(): Always print a newline after invoking
    dict_print_info_on_foreign_key_in_create_format().
  #16827: Better InnoDB error message if ibdata files omitted from my.cnf.
  #17126: CHECK TABLE on InnoDB causes a short hang during check of adaptive hash.
    CHECK TABLE blocking other queries, by releasing the btr_search_latch
    periodically during the adaptive hash table validation.
  #17405: Valgrind: conditional jump or move depends on uninitialised valuesw.
    buf_block_init(): Reset magic_n, buf_fix_count, and io_fix to avoid testing
    uninitialised variables.
  #18077: InnoDB uses full explicit table locks in stored FUNCTION.
  #18238: When locks exhaust the buffer pool, InnoDB does not roll back the trx.
    Check in pessimistic insert and update if the buffer pool is exhausted by locks.
  #18252: Disk space leaks in updates of InnoDB BLOB rows.
    btr_cur_pessimistic_update(): Invoke rec_get_offset() after rec_set_field_extern_bits().
    btr_store_big_rec_extern_fields(): Note that offsets will no longer be valid
    after calling this function.
  #18283: When InnoDB returns error 'lock table full', MySQL can write to binlog too much.
  #18384: InnoDB memory leak on duplicate key errors if row has many columns.
    row_ins_duplicate_error_in_clust(): Call mem_heap_free(heap) at func_exit if needed.
  #18350: Use consistent read in CREATE ... SELECT .. if innodb_locks_unsafe_for_binlog is used.

  If installed, search built in lib path first, bug#13158

  Added "ndb_error_reporter" script, bug#18421

into mysql.com:/Users/kent/mysql/bk/mysql-4.1-new

  Install "ndb_size.pl" script and template, bug#18421

into  zippy.(none):/home/cmiller/work/mysql/mysql-5.0__bug11151

No longer create or commit transactions within the loading of files.

into  mysql.com:/usr/home/bar/mysql-5.0

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

into  mysql.com:/usr/home/bar/mysql-4.1.b15098

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

  After merge fix.

  Ndbapi can reorder recattr when doing sorted scan (for faster comparision)
    make sure handler maps correct recattr to correct mysql column

into  mysql.com:/usr/home/bar/mysql-5.0
Bug#15098

into  rurik.mysql.com:/home/igor/mysql-5.0

An invalid assertion in Item_direct_view_ref::eq caused 
an assertion abort in the debug version.

into  zim.(none):/home/ian/workspace/mysql-5.0

into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new

into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new

  Remove Solaris -xc99=none C option as C++ compiler can't handle it

in older version.

The problem is that TRN-files created in "old" versions contain
junk in trigger_table field, which is not acceptable in "new" versions.

into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new

  We are not to control what malloc package others are to use, remove -lmtmalloc from --libs(_r), bug#18322

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

into  mysql.com:/space/pekka/ndb/version/my50

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

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

  Reproduced in 5.0.16-nt. Tested to work in 5.0.20
  

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

This fixes the problem if someone is using struct MYSQL as part of another structure together with a shared
library

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

into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1