into mysql.com:/home/hf/work/mysql-5.1.clean

sql/ha_ndbcluster.h:
  Fix HPUX compilation (copy-paste error I think).

into  mysql.com:/home/hartmut/projects/mysql/dev/5.1/gcc41

into  mysql.com:/home/bk/b17400-mysql-5.1-new

Fixing tests to get the test suite passing. This does not hide the bug
since it's a matter of performance, not correctness.


mysql-test/t/binlog_row_blackhole.test:
  Disabling ps-protocol for the test.
mysql-test/t/binlog_row_insert_select.test:
  Disabling ps-protocol for the test.
mysql-test/t/binlog_row_mix_innodb_myisam.test:
  Disabling ps-protocol for the test.
mysql-test/t/rpl_row_create_table.test:
  Disabling ps-protocol for the test.
mysql-test/t/rpl_row_flsh_tbls.test:
  Disabling ps-protocol for the test.

into mysql.com:/home/hf/work/mysql-5.1.clean


sql/sql_partition.cc:
  Auto merged

added THD::work_part_info member where we now store modified
partition_info structure.
It allows no solve problem when different parts of the part_info get
into different mem_roots


sql/partition_info.cc:
  get_clone implementation
sql/partition_info.h:
  get_clone() declared
sql/sql_class.h:
  THD::work_part_info added
sql/sql_partition.cc:
  thd->work_part_info instead of lex->part_info
sql/sql_table.cc:
  thd->work_part_info instad of lex->part_info
sql/unireg.cc:
  thd->work_part_info instad of lex->part_info

into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new

into  mysql.com:/home/bk/b17400-mysql-5.1-new

into  mysql.com:/home/bk/b17400-mysql-5.1-new


sql/sql_parse.cc:
  Auto merged

Filter out replication general_log and slow_log entirely from binary
log. Caching result of table share-specific tests.


mysql-test/r/binlog_row_drop_tmp_tbl.result:
  Result change
mysql-test/r/rpl_row_log.result:
  Result change
mysql-test/r/rpl_row_log_innodb.result:
  Result change
mysql-test/r/rpl_row_max_relay_size.result:
  Result change
sql/handler.cc:
  Refactoring code to support filtering many tables.
  Filtering out mysql.general_log and mysql.slow_log from binary log.
  Caching result from table share-specific tests.
sql/sql_class.cc:
  Correcting comment
sql/sql_parse.cc:
  Using binlog_query() instead of constructing Query_log_events
sql/table.cc:
  Adding variable to cache table check parts for row-based logging.
sql/table.h:
  Adding variable to cache table check parts for row-based logging.

into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new

into  ibmlab.site:/home/my/bk/mysql-5.1-new

into  production.mysql.com:/usersnfs/rburnett/mysql-5.1

mysql-test/r/events.result:
  update result
mysql-test/r/events_bugs.result:
  update result after manual merge
mysql-test/t/events.test:
  move from error number to a constant
mysql-test/t/events_bugs.test:
  update error codes

sql/event_timed.cc:
  Auto merged

into mysql.com:C:/cygwin/home/mysqldev/my/mysql-5.1-new

into  ibmlab.site:/home/my/bk/mysql-5.1-new

into  mysql.com:/opt/local/work/mysql-5.1-root


sql/sql_lex.h:
  Auto merged

into mysql.com:C:/cygwin/home/mysqldev/my/mysql-5.1-new

Without resetting, the next test will not pass.

into  ibmlab.site:/home/my/bk/mysql-5.1-new

into  shellback.(none):/home/msvensson/mysql/mysql-5.1

into  shellback.(none):/home/msvensson/mysql/mysql-5.1

into mysql.com:C:/cygwin/home/mysqldev/my/mysql-5.1-new

extra/cmakelists.txt:
  Another attempt at fixing the comp_err/GenError dependency problem.
sql/cmakelists.txt:
  Another attempt at fixing the comp_err/GenError dependency problem.
client/cmakelists.txt:
  Another attempt at fixing the comp_err/GenError dependency problem.
libmysql/cmakelists.txt:
  Another attempt at fixing the comp_err/GenError dependency problem.
server-tools/instance-manager/cmakelists.txt:
  Another attempt at fixing the comp_err/GenError dependency problem.

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

into  shellback.(none):/home/msvensson/mysql/mysql-5.1


include/config-win.h:
  Auto merged

into  xiphis.org:/home/antony/work2/p1-bug14575.1-mrg2

into  shellback.(none):/home/msvensson/mysql/mysql-5.1

into mysql.com:C:/cygwin/home/mysqldev/my/mysql-5.1-new

client/cmakelists.txt:
  Fix dependency problem with the old GenError target.
extra/cmakelists.txt:
  Fix dependency problem with the old GenError target.
libmysql/cmakelists.txt:
  Fix dependency problem with the old GenError target.
server-tools/instance-manager/cmakelists.txt:
  Fix dependency problem with the old GenError target.
sql/cmakelists.txt:
  Fix dependency problem with the old GenError target.
win/README:
  Fix dependency problem with the old GenError target.

into  xiphis.org:/home/antony/work2/p1-bug14575.1-mrg2


include/config-win.h:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/mysql_priv.h:
  merge bug#14575 forwards
sql/mysqld.cc:
  merge bug#14575 forwards

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


sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

(one patch)


mysql-test/r/events_bugs.result:
  fix for bug 16408
mysql-test/t/events_bugs.test:
  fix for bug 16408
sql/event.h:
  fix for bug 16408
sql/event_timed.cc:
  fix for bug 16408
sql/sql_parse.cc:
  fix for bug 16408
sql/sql_yacc.yy:
  fix for bug 16408