into  polly.local:/home/kaa/src/maint/mysql-5.1-maint

into  polly.local:/home/kaa/src/maint/bug24192/my51-bug24192

In case of out-of-memory error received from the master, print the corresponding message to the error log and stop slave I/O thread to avoid reconnecting with a wrong binary log position.

Streamlining test for RBR

into  mysql.com:/home/tnurnberg/22540/51-22540

into  mysql.com:/home/tnurnberg/22540/51-22540

into  mysql.com:/home/tnurnberg/22540/50-22540

streamlining the test

into  mysql.com:/home/tnurnberg/22540/51-22540

into  sita.local:/Users/tsmith/m/bk/maint/51

Apply innodb-5.0-* snapshots:  ss1489 and ss1547.

Fixes:
Bug#9709:  InnoDB inconsistensy causes "Operating System Error 32/33"
Bug#22819: SHOW INNODB STATUS crashes the server with an assertion failure under high load
Bug#25645: Assertion failure in file srv0srv.c
Bug#27294: insert into ... select ... causes crash with innodb_locks_unsafe_for_binlog=1
Bug#28138: indexing column prefixes produces corruption in InnoDB

into  sita.local:/Users/tsmith/m/bk/maint/51

After applying the snapshots, ensure that code conforms to the final version
of WL 3914.

It is signficant that, after these changes, InnoDB does not define MYSQL_SERVER,
and can be built as an independent storage engine plugin.

Fixes:
Bug#9709:  InnoDB inconsistensy causes "Operating System Error 32/33"
Bug#18828: If InnoDB runs out of undo slots, it returns misleading 'table is full'
Bug#20090: InnoDB: Error: trying to declare trx to enter InnoDB
Bug#20352: Make ibuf_contract_for_n_pages tunable
Bug#21101: Wrong error on exceeding max row size for InnoDB table
Bug#21293: Deadlock detection prefers to kill long running FOR UPDATE queries
Bug#22819: SHOW INNODB STATUS crashes the server with an assertion failure under high load
Bug#25078: Make the replication thread to ignore innodb_thread_concurrency
Bug#25645: Assertion failure in file srv0srv.c
Bug#28138: indexing column prefixes produces corruption in InnoDB

into  mysql.com:/home/ram/work/mysql-5.1-maint

Problem: we don't take into account the length of the data written
to the temporary data file during update on a CSV table.

Fix: properly calculate the data file length during update.

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-maint

- correct result files

Dont touch & chmod the err_log file if using syslog (mysqld_safe)

into  sita.local:/Users/tsmith/m/bk/maint/51

into  sita.local:/Users/tsmith/m/bk/maint/50

  Fix a few typos in comments (from Paul DuBois)

into  sita.local:/Users/tsmith/m/bk/maint/51

  Backport from 5.1 a fix to make this test deterministic

into  sita.local:/Users/tsmith/m/bk/maint/51

into  sita.local:/Users/tsmith/m/bk/maint/51

into  sita.local:/Users/tsmith/m/bk/maint/50

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-maint

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-maint

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-maint

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-maint

  post-merge fix: re-enable rpl_udf test

into  sita.local:/Users/tsmith/m/bk/maint/51

This merge requires a post-merge fix to remove rpl_udf from
suite/rpl/t/disabled.def.

into  sita.local:/Users/tsmith/m/bk/maint/50

- correct result files

into  sita.local:/Users/tsmith/m/bk/maint/50

into  sita.local:/Users/tsmith/m/bk/maint/41

into  sita.local:/Users/tsmith/m/bk/maint/50

dollin' it up for Guilhem ;) -- test streamlined,
better comments, faster code, add'l assert.