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

  store copy of partition function string


mysql-test/r/partition.result:
  Fix for bug#14363 Partitions: failure if create in stored procedure
    test case
mysql-test/t/partition.test:
  Fix for bug#14363 Partitions: failure if create in stored procedure
    test case

  added '_' to allowed tag body symbols


mysql-test/r/xml.result:
  Bug#16320 XML: extractvalue() won't accept names containing underscores
    test case
mysql-test/t/xml.test:
  Bug#16320 XML: extractvalue() won't accept names containing underscores
    test case

into mysql.com:/home/gluh/MySQL/Bugs/5.1.17568

is not that reliable (re #17815). Not perfect solution but will work
till #17815 is fixed.

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

mysql-test/r/events_slow_query.result:
  fix result
mysql-test/t/events_slow_query.test:
  create different event because the executor is buggy and won't catch the difference if
  the memory address does not change (will be reported as bug separately)
sql/sp_head.cc:
  this was an error which passed code review. thd->enable_slow_log could be
  changed and it should not be relied

into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new


sql/sql_parse.cc:
  Auto merged

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

Events: Event-caused statements don't appear in the slow query log
WL#1034


sql/event_executor.cc:
  enable slow logging
sql/event_timed.cc:
  enable slow logging for the anonymous SP
sql/sp_head.cc:
  allow thd->enable_slow_log to be TRUE if only
  m_flags & sp_head::LOG_SLOW_STATEMENTS
  Because usually enable_slow_log is 1 in user mode, this second
  check is needed backup the mode otherwise.
sql/sp_head.h:
  add a new constant for slow queries. SP by default does not log slow queries in the
  body just the whole CALL could be considered as slow if taking too much time and
  called directly from the user
sql/sql_parse.cc:
  let us see in the the trace log

into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1

into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1


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

into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0


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

  Add real_sleep tests.


mysql-test/t/mysqltest.test:
  Add real_sleep tests.

configure.in:
  Auto merged
client/mysqlimport.c:
  Auto merged
include/config-win.h:
  Auto merged
mysql-test/r/create.result:
  Auto merged
mysql-test/t/create.test:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
scripts/mysql_fix_privilege_tables.sql:
  Auto merged
sql/field.h:
  Auto merged
sql/log_event.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_partition.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
mysql-test/t/mysqldump.test:
  SCCS merged

into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1


client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/mysqltest.result:
  Auto merged

  expand tab


client/mysqltest.c:
  expand tab

into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0


client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/mysqltest.result:
  Auto merged

  Fix URLs.
README:
  Fix URL.
mysqltest.result:
  Update test result for real_sleep error message.
mysqltest.c:
  Fix do_sleep() to print correct command name for real_sleep.


client/mysqltest.c:
  Fix do_sleep() to print correct command name for real_sleep.
mysql-test/r/mysqltest.result:
  Update test result for real_sleep error message.
mysql-test/README:
  Fix URL.
mysql-test/mysql-test-run.sh:
  Fix URLs.

into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1


client/mysqltest.c:
  Auto merged

  Fix reference to incorrect (non-existent) options in comment.


client/mysqltest.c:
  Fix reference to incorrect (non-existent) options in comment.

into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0


client/mysqltest.c:
  Auto merged

  Correct/clarify comments.


client/mysqltest.c:
  Correct/clarify comments.

the warnings came from MSFT compiler (output of pushbuild)


sql/event.cc:
  fix compiler warnings: precision loses, unused vars
sql/event_executor.cc:
  fix compiler warnings: precision loses, unused vars
sql/event_timed.cc:
  fix compiler warnings: precision loses, unused vars

into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1


client/mysqltest.c:
  Auto merged

  Fix typos.


client/mysqltest.c:
  Fix typos.

into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0


client/mysqltest.c:
  y
  manual merge

  Fix typos.


client/mysqltest.c:
  Fix typos.

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

fix for bug#17793 (Scheduler uses class event_timed should be Event_timed)


sql/event.cc:
  class event_timed -> Event_timed
sql/event.h:
  class event_timed -> Event_timed
sql/event_executor.cc:
  class event_timed -> Event_timed
sql/event_priv.h:
  class event_timed -> Event_timed
sql/event_timed.cc:
  class event_timed -> Event_timed
sql/sql_lex.h:
  class event_timed -> Event_timed
sql/sql_show.cc:
  class event_timed -> Event_timed
sql/sql_yacc.yy:
  class event_timed -> Event_timed

into  mysql.com:/space/pekka/ndb/version/my51

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

(forgotten to be committed)

storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  blob fix 1: cache no tables at create.
  previously main table was cached before blob tables were ready.
  autoincr fix to avoid caching as side-effect.
  also removes some rename fix where createBlobTables had old/new args.
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  blob fix 1: cache no tables at create.
  previously main table was cached before blob tables were ready.
  autoincr fix to avoid caching as side-effect.
  also removes some rename fix where createBlobTables had old/new args.
storage/ndb/src/ndbapi/ndberror.c:
  blob fix 1: cache no tables at create.
  previously main table was cached before blob tables were ready.
  autoincr fix to avoid caching as side-effect.
  also removes some rename fix where createBlobTables had old/new args.

mysql-test/extra/rpl_tests/rpl_ndb_2multi_eng.test:
  Updated from review comments
mysql-test/include/rpl_multi_engine3.inc:
  Updated from review comments

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

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

(post-review pre-push changes)
coding style (mostly trailing spaces removed)


mysql-test/r/events.result:
  fix result file
sql/event.cc:
  - remove trailing spaces
  - add a missing initializer (gcc warning)
  - C++ to C comments
sql/event_executor.cc:
  - fix coding style (C++ to C comments, remove trailing spaces)
  - fix wrong indexing buggie not found till now (queue indexing is 0 based,
    not 1 based)
sql/event_timed.cc:
  - fix coding style

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

- moved used_partitions initialization