loaded at runtime.


extra/comp_err.c:
  Don't use DBUG after my_end, crashes on Windows with USE_TLS.
include/my_dbug.h:
  Add missing DBUG_LEAVE in non-debug builds.
include/my_pthread.h:
  Add comment explaining USE_TLS.
libmysql/cmakelists.txt:
  Add USE_TLS to avoid crashing when loading libmysql.dll at runtime.
mysys/cmakelists.txt:
  Add USE_TLS to avoid crashing when loading libmysql.dll at runtime.
mysys/my_init.c:
  Don't use DBUG after my_thread_end(), as it crashes on Windows TLS.

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

into  c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug17754

into  c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug17754


mysql-test/r/partition.result:
  Auto merged
mysql-test/t/partition.test:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_partition.cc:
  manual merge

Fixed result files


mysql-test/r/ndb_partition_key.result:
  Fixed result files
mysql-test/r/partition.result:
  Fixed result files

by previous push.

into  c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug17754


mysql-test/r/partition.result:
  Auto merged
mysql-test/t/partition.test:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_partition.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/r/ndb_partition_key.result:
  manual merge
mysql-test/t/ndb_partition_key.test:
  manual merge

Added new syntax ALTER TABLE t1 REMOVE PARTITIONING,
changed semantics of ALTER TABLE t1 ENGINE=X; to not remove partitioning
Fix a number of mix engine bugs in partitioning


mysql-test/r/ndb_partition_key.result:
  Added a number of new test cases
mysql-test/r/partition.result:
  Added a number of new test cases
mysql-test/t/ndb_partition_key.test:
  Added a number of new test cases
mysql-test/t/partition.test:
  Added a number of new test cases
sql/lex.h:
  REMOVE and PARTITIONING added as keywords in parser
sql/sql_lex.h:
  Added flag to alter_info flag
sql/sql_partition.cc:
  Fixes for the new syntax, changes of the current semantics of the syntax.
  Fixes for errors in handling mixes of table handlers in partitioning syntax
  for ALTER TABLE
sql/sql_table.cc:
  Bug fix
sql/sql_yacc.yy:
  New syntax for REMOVE PARTITIONING

sql/sql_partition.cc:
  Auto merged

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

  added HA_EXTRA_WRITE_CACHE case to ha_partition::extra()


mysql-test/r/partition.result:
  Fix for bug#15336 Partitions: crash if create table as select
    test case
mysql-test/t/partition.test:
  Fix for bug#15336 Partitions: crash if create table as select
    test case

sql/sql_class.h:
  line #ifdef-ed

  use part_info->item_free_list instead of thd->free_list during partition function parsing


mysql-test/r/partition.result:
  Bug#14367 Partitions: crash if utf8 column
    test case
mysql-test/t/partition.test:
  Bug#14367 Partitions: crash if utf8 column
    test case
sql/item.cc:
  Bug#14367 Partitions: crash if utf8 column
    create copy of string in current mem_root to avoid memory leak

additional fixes


mysql-test/r/partition.result:
  result fixed
mysql-test/t/partition.test:
  testcase
sql/sql_parse.cc:
  part_info cloning moved here
sql/sql_partition.cc:
  fixes
sql/sql_table.cc:
  part_info cloning removed

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