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

storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Add debug printouts
storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp:
  Add debug printouts
  Fix leak of extents
storage/ndb/src/kernel/blocks/pgman.cpp:
  Add debug printouts

structs in PARTITION_ITERATOR

when I ran mysql-test-run

into  mysql.com:/home/mysql_src/mysql-5.1-new

sql/parse_file.cc:
  since recently, the "dir" parameter can be 0.

into  mysql.com:/home/psergey/mysql-5.1-ppruning-r5-push

into  mysql.com:/usr/home/bar/mysql-5.1-new.fscs

  Try to open an old 5.0 table name
  if encoded name doesn't exist.
  This makes SELECT working without having
  to rename tables with tricky characters
  in name into 5.1 format (simpliefies upgrade).


sql/table.cc:
  Try to open an old 5.0 table name
  if encoded name doesn't exist.
  This makes SELECT working without having
  to rename tables with tricky characters
  in name into 5.1 format (simpliefies upgrade).

into  mysql.com:/home/psergey/mysql-5.1-ppruning-r5-push


mysql-test/r/binlog_row_ctype_cp932.result:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged

into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new

  Updated to remove ndb_dd_disk2memory
ndb_dd_disk2memory.result:
  Updated results to match change to show create table for NDB tables. WL 2604


mysql-test/r/ndb_dd_disk2memory.result:
  Updated results to match change to show create table for NDB tables. WL 2604
mysql-test/t/disabled.def:
  Updated to remove ndb_dd_disk2memory

storage/ndb/src/kernel/blocks/tsman.cpp:
  Round filesize upwards

  fix typo + add error code to printable list


storage/ndb/include/kernel/signaldata/Extent.hpp:
  Set correct error code
storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp:
  err is already negative
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Set correct error code
storage/ndb/src/ndbapi/ndberror.c:
  Add error code to printable list

into  linux.site:/home/reggie/work/mysql-5.1

into  linux.site:/home/reggie/work/mysql-5.1-bug16718

into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new

  Updated with new bug number


mysql-test/t/disabled.def:
  Updated with new bug number

into  mysql.com:/home/cps/mysql/trees/5.1/5.1-virgin-no-debug

into  mysql.com:/home/mysql_src/mysql-5.1-new

Fix for the test failure of binlog_row_ctype_cp932. Note that since we pushed row-based replication,
"make test" != "mysql-test-run && mysql-test-run --ps-protocol". "make test" is what should be used;
had it been, the failure would have been noticed earlier. Putting back cxx flags I had by accident removed.
Disclaimer: 5.1-new is in a sorry state: log_tables and some ndb* fail, mysqlslap test crashes randomly in a row-based replication assertion (sql_class.cc:2207). 


BUILD/SETUP.sh:
  Putting back flags which I, by accident, removed during the push of row-based replication (I had removed
  them in my tree because they cause tens of wrong warnings with my gcc4.0.0, and committed that by accident).
mysql-test/r/binlog_row_ctype_cp932.result:
  result update (people should run "make test" now, it tests row-based replication too).

into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new


mysql-test/t/disabled.def:
  Auto merged

  Disabled ndb_dd_disk2memory


mysql-test/t/disabled.def:
  Disabled ndb_dd_disk2memory

this was fixed by WL 2604


mysql-test/r/partition_mgm_err.result:
  result block for bug#15523
mysql-test/t/partition_mgm_err.test:
  test block for bug #15523

This bug was fixed as part of the large WL 2604 push.


mysql-test/r/partition_mgm_err.result:
  results block for bug #16534
mysql-test/t/partition_mgm_err.test:
  test block for bug# 16534

into lmy004.:/work/mysql-5.1-tt-copy-works


sql/event.cc:
  Auto merged
sql/event_executor.cc:
  Auto merged
sql/event_timed.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

change status variable from have_partition_engine to have_partitioning.


mysql-test/include/have_partition.inc:
  updated to use new status variable
mysql-test/r/have_partition.require:
  updated to use new status variable
sql/set_var.cc:
  change status variable from have_partition_engine to have_partitioning.

into  mysql.com:/home/cps/mysql/trees/5.1/5.1-virgin-no-debug


mysql-test/t/log_tables.test:
  Auto merged

The log content is obviously different in two modes,
as Queries are translated into Prepare and Execute
commands. Thus we should use test only in one mode
to get the match with result.


mysql-test/t/log_tables.test:
  disable ps-protocol in log_tables test

into lmy004.:/work/mysql-5.1-bug16548


mysql-test/t/disabled.def:
  Auto merged

into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new

into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new


mysql-test/t/disabled.def:
  Auto merged

  updated


mysql-test/t/disabled.def:
  updated

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

  uninit variable


storage/ndb/include/kernel/signaldata/LqhFrag.hpp:
  Correct signal length

  Added comments on 1022 per Lars request


mysql-test/extra/rpl_tests/rpl_foreign_key.test:
  Added comments on 1022 per Lars request

sql/event.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
scripts/mysql_create_system_tables.sh:
  SCCS merged

into lmy004.:/work/mysql-5.1-bug16548

mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged