Increased version number because of clone-off

into  mysql.com:/opt/local/work/mysql-5.0-15683

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

 the innodb-5.0-ss368 snapshot.

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  mysql.com:/home/dlenev/mysql-5.0-bg17764

A table with an on insert trigger was reported as crashed when the insert
was processed with bulk insert mode on (handler::start_bulk_insert).
The trigger was also selecting from the same table, and that caused
the "crash".
The same problem was present when an insert statement, which was processed
in bulk mode, also used a stored function that was reading the same table.

This fix disables bulk inserts if a statement uses functions or invokes
triggers. Implementing more granular checks will require much more code and
therefore can hardly be done in 5.0

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  mysql.com:/extern/mysql/5.0/bug17015/mysql-5.0-runtime

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.

into  mysql.com:/extern/mysql/5.0/bug17015/mysql-5.0-runtime

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

into  mysql.com:/extern/mysql/5.0/bug16474/mysql-5.0-runtime

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

VIEWs, Prepared statement": we didn't mark the nested views
as 'prelockng placeholders' when building the prelocking list. 
This resulted in these views being processed (merged, materialized)
before they are actually used. 

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