NDB cluster is not fully supported. This will be added with
WL 1892 (NDB Handler: Add support for CREATE/DROP INDEX).
Some preparatory code for this is already present though.
A change for the "duplicate key" error message is planned
for another changeset.


include/my_base.h:
  WL#1563 - Modify MySQL to support fast CREATE/DROP INDEX
  Defined a mask of flags which must be the same for two indexes
  if they should compare as compatible.
  Added an error number for a new drop index error message.
mysql-test/r/key.result:
  WL#1563 - Modify MySQL to support fast CREATE/DROP INDEX
  The test result.
mysql-test/t/key.test:
  WL#1563 - Modify MySQL to support fast CREATE/DROP INDEX
  The test case.
sql/handler.cc:
  WL#1563 - Modify MySQL to support fast CREATE/DROP INDEX
  Prepared for a later change in an error message:
  Replace index number by index name for "duplicate key" error.
  Added handling for the new drop index error message.
sql/handler.h:
  WL#1563 - Modify MySQL to support fast CREATE/DROP INDEX
  Added new flags and methods.
  Removed old flags and methods (from the last attempt).
sql/share/errmsg.txt:
  WL#1563 - Modify MySQL to support fast CREATE/DROP INDEX
  Added a new error message for drop index.
sql/sql_table.cc:
  WL#1563 - Modify MySQL to support fast CREATE/DROP INDEX
  Moved definitions to the top of the file.
  In mysql_prepare_table() allow an index to have the name
  "PRIMARY" if it has the key type "Key::PRIMARY".
  Added a parenthesis for readability.
  Removed old code from the last attempt.
  Some changes to compare_tables():
  - Input parameter "List<Key> *key_list" is replaced by
    "KEY *key_info_buffer, uint key_count".
  - Output parameters added: "index_drop_buffer/index_drop_count"
    and "index_add_buffer/index_add_count".
  - Key comparison must now find matching keys in changed
    old and new key lists.
  - Key comparison of a key is easier now because both old
    and new keys are of type 'KEY'.
  Call mysql_prepare_table() before compare_tables(). The
  translated KEY structs are needed at some places now.
  Inserted a code segment for checking alter_table_flags().
  Removed mysql_prepare_table() from the 'partition' branches
  (it is done above now).
  Removed a pair of unnecessary braces.
  Inserted a code segment for executing fast add/drop index.
  Made close of table dependent on whether it was opened.
  Prepared for NDB cluster support.
  Fixed commit to be called outside of LOCK_open.

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

  Typo fix.
  Thanks Serg for noticing this.


sql/sql_table.cc:
  Typo fix.
  Thanks Serg for noticing this.

Really dumb typo....


sql/ha_archive.h:
  Fix typo

Archive uses native row format, so honestly this is just the change in a flag. 


sql/ha_archive.h:
  Added bit field support (and dropped the ha_not_exact_count since we always have this).
mysql-test/r/archive_bitfield.result:
  New BitKeeper file ``mysql-test/r/archive_bitfield.result''
mysql-test/t/archive_bitfield.test:
  New BitKeeper file ``mysql-test/t/archive_bitfield.test''

into  zim.(none):/home/brian/mysql/archive-5.1

after my push of WL#1034 (Internal CRON) into 5.1


BitKeeper/deleted/.del-event.h~2c9fb599ae4e39e7:
  Delete: libmysqld/event.h

into  zim.(none):/home/brian/mysql/archive-5.1

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

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

bug: check if storage engine is enabled to avoif code dump


BitKeeper/etc/ignore:
  Added storage/ndb/test/ndbapi/DbAsyncGenerator storage/ndb/test/ndbapi/DbCreate storage/ndb/test/ndbapi/ndbapi_slow_select storage/ndb/test/ndbapi/testBitfield storage/ndb/test/ndbapi/testLcp storage/ndb/test/ndbapi/testPartitioning storage/ndb/test/ndbapi/testReadPerf storage/ndb/test/ndbapi/test_event_merge storage/ndb/test/tools/listen_event to the ignore list

- add a bit more debug messages
- disable events.test for now due to a bug


mysql-test/r/events.result:
  fix result
mysql-test/t/disabled.def:
  make it disabled
mysql-test/t/events.test:
  disable show processlist
sql/event_executor.cc:
  a bit more debug messages

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

mysql-test/t/ndb_dd_basic.test:
  Changed test.t1 back to t1 per Jonas's review
mysql-test/r/ndb_dd_basic.result:
  Changed test.t1 back to t1 per Jonas's review

into  zim.(none):/home/brian/mysql/archive-5.1

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

- various fixes of test cases
(hopefully the last pre-push update before the push)


mysql-test/include/system_db_struct.inc:
  extend test case to include testing for event system table
mysql-test/r/events.result:
  results of events test
mysql-test/r/system_mysql_db.result:
  more testing - add structure of event system table
mysql-test/t/events.test:
  test case for events (internal CRON)
mysql-test/t/system_mysql_db_fix.test:
  drop event table and leave the test database empty
scripts/mysql_create_system_tables.sh:
  add missing create table statement
scripts/mysql_fix_privilege_tables.sql:
  don't specify the database. this fixes a failing test case which creates the
  tables not on mysql but on a test database and then tests again mysql.
sql/event_executor.cc:
  if asked to stop -> stop.

mysql-test/t/ndb_dd_basic.test:
  Rename: mysql-test/t/ndb_basic_disk.test -> mysql-test/t/ndb_dd_basic.test
mysql-test/r/ndb_dd_basic.result:
  Rename: mysql-test/r/ndb_basic_disk.result -> mysql-test/r/ndb_dd_basic.result
mysql-test/t/ndb_dd_ddl.test:
  New Disk Data DDL Test case. Formally know as ndb_dd_dupcase.test
mysql-test/r/ndb_dd_ddl.result:
  New Disk Data DDL Test case. Formally know as ndb_dd_dupcase.test

into  devsrv-b.mysql.com:/space/magnus/my51-wl2930_fixup

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

into  april.(none):/home/svoj/devel/mysql/warnings/mysql-5.1-new

into  mysql.com:/usr/local/mysql/tmpbuild2

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

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

into  devsrv-b.mysql.com:/space/magnus/my51-wl2930_fixup

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


sql/sql_show.cc:
  Auto merged

after another merge fixes.


mysql-test/r/information_schema.result:
  WL #1034 (Internal CRON)
  fix result
mysql-test/r/mysqlcheck.result:
  WL #1034 (Internal CRON)
  fix result
mysql-test/r/sp.result:
  WL #1034 (Internal CRON)
  fix result
sql/event.cc:
  after fixes for WL1012 fix these to be able to compile
sql/event_timed.cc:
  after fixes for WL1012 fix these to be able to compile
sql/share/errmsg.txt:
  readd error messages removed during manual update
sql/sql_yacc.yy:
  fix sql_yacc.yy for WL#1034 (Internal CRON) after the manual
  merge. The merge wasn't good :(

into mysql.com:/home/gluh/MySQL/Merge/5.1-new

into mysql.com:/home/gluh/MySQL/Merge/5.1-new

mysql-test/extra/binlog_tests/ctype_cp932.test:
    fixed test case
mysql-test/r/binlog_stm_ctype_cp932.result:
    fixed test result
mysql-test/t/ctype_ucs.test:
    fixed test case
sql/sql_show.cc:
   Compilation with disabled partitioning is fixed

sql/Makefile.am:
  Auto merged
sql/lex.h:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged

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

mysql-test/t/rpl_multi_engine.test:
  merge fix
libmysqld/sql_tablespace.cc:
  New BitKeeper file ``libmysqld/sql_tablespace.cc''
mysql-test/r/ndb_basic_disk.result:
  New BitKeeper file ``mysql-test/r/ndb_basic_disk.result''
mysql-test/t/ndb_basic_disk.test:
  New BitKeeper file ``mysql-test/t/ndb_basic_disk.test''
sql/sql_tablespace.cc:
  New BitKeeper file ``sql/sql_tablespace.cc''
storage/ndb/src/kernel/blocks/OptNR.txt:
  New BitKeeper file ``storage/ndb/src/kernel/blocks/OptNR.txt''
storage/ndb/src/kernel/vm/mem.txt:
  New BitKeeper file ``storage/ndb/src/kernel/vm/mem.txt''
storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp:
  New BitKeeper file ``storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp''
storage/ndb/src/kernel/vm/ndbd_malloc_impl.hpp:
  New BitKeeper file ``storage/ndb/src/kernel/vm/ndbd_malloc_impl.hpp''
storage/ndb/tools/ndb_error_reporter:
  New BitKeeper file ``storage/ndb/tools/ndb_error_reporter''

into  neptunus.(none):/home/msvensson/mysql/wl2930_fixup/my51-wl2930_fixup


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

client/mysqltest.c:
  Add comments
  Group inits logically

Fix problem with strange printout of line numbers, detected on aix52, but existing on all platforms, just being masked by init of vars to zero.


client/mysqltest.c:
  Remove lineno_stack, instead use the already existing file_stack and add a new variable lineno to keep track of what line in the file we are at.
mysql-test/r/mysqltest.result:
  Correct test result, "At line 1" should be printed

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


storage/ndb/src/common/portlib/Makefile.am:
  Auto merged
BitKeeper/deleted/.del-gcc.cpp~3d2e013cfac48838:
  Auto merged
storage/ndb/config/common.mk.am:
  Manual merge.

  Checking that binlog is open before calling binlog_query().


mysql-test/r/rpl_row_basic_11bugs.result:
  Result change caused by test change.
mysql-test/t/rpl_row_basic_11bugs.test:
  Ignoring format event since it contain the version number.
sql/sql_insert.cc:
  Debriding code.
  Checking that binlog is open before calling binlog_query().