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  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  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

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

into  zim.(none):/home/mikael/bug17772

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

A crash after ALTER TABLE t1 RENAME ...


mysql-test/r/partition.result:
  New test case
mysql-test/t/partition.test:
  New test case
sql/sql_lex.h:
  Introduced like name for CREATE TABLE t1 LIKE t2
sql/sql_parse.cc:
  Introduced like name for CREATE TABLE t1 LIKE t2
sql/sql_partition.cc:
  Introduced like name for CREATE TABLE t1 LIKE t2
sql/sql_yacc.yy:
  Introduced like name for CREATE TABLE t1 LIKE t2

with show create event"


sql/sql_lex.h:
  Add a comment.

into  mysql.com:/usr/local/mysql/mysql-5.1-new


mysql-test/lib/mtr_timer.pl:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged

mysql-test/lib/mtr_timer.pl:
  Fix bug where ^C would trigger cleanup handler in both parent and
  timeout child processes, causing duplicated messages and potential
  conflicts.

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

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


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

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


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

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

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

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


include/config-win.h:
  Auto merged

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

Unable to reproduce failure: some of the 17400 tests pass, other have other failures.
The test in the bug report passes.
Enabling some tests that pass, rebranding others.


mysql-test/t/disabled.def:
  Enabling tests that pass
  Rebranding disabled tests

  ¨MySQL server crashes if you try to access to InnoDB table¨
  crash caused by schizophrenic mysqld - 2 memory locations for logically same function
  with conflicting values.
  Fixed by backporting from 5.1 changes to have_xyz_db declarations.


sql/mysql_priv.h:
  Backport have_xyz_db changes from 5.1
sql/mysqld.cc:
  Backport have_xyz_db changes from 5.1

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