into  mysql.com:/home/mydev/mysql-5.1-wl1563

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

fix problem that gcc4 does not like at all


sql/event.h:
  fix problem that gcc4 does not like at all

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

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

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


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

into  mysql.com:/home/mydev/mysql-5.1-wl1563

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

into  mysql.com:/home/mydev/mysql-5.1-wl1563

  Test cleanip per lars
.del-rpl_row_sp000.result~2b24650b123e20a9:
  Delete: mysql-test/r/rpl_row_sp000.result
.del-rpl_row_sp000.test~645e2807516682b6:
  Delete: mysql-test/t/rpl_row_sp000.test
.del-rpl_row_sp000-slave.opt~d84baa1f59616d77:
  Delete: mysql-test/t/rpl_row_sp000-slave.opt
.del-rpl_row_sp000-master.opt~da625c0a51a2f08a:
  Delete: mysql-test/t/rpl_row_sp000-master.opt
rpl_sp.result:
  Rename: mysql-test/r/rpl_stm_sp.result -> mysql-test/r/rpl_sp.result
rpl_sp-master.opt:
  Rename: mysql-test/t/rpl_stm_sp-master.opt -> mysql-test/t/rpl_sp-master.opt
rpl_sp-slave.opt:
  Rename: mysql-test/t/rpl_stm_sp-slave.opt -> mysql-test/t/rpl_sp-slave.opt
rpl_sp.test:
  Rename: mysql-test/t/rpl_stm_sp.test -> mysql-test/t/rpl_sp.test


mysql-test/t/rpl_sp-slave.opt:
  Rename: mysql-test/t/rpl_stm_sp-slave.opt -> mysql-test/t/rpl_sp-slave.opt
mysql-test/t/rpl_sp-master.opt:
  Rename: mysql-test/t/rpl_stm_sp-master.opt -> mysql-test/t/rpl_sp-master.opt
mysql-test/r/rpl_sp.result:
  Rename: mysql-test/r/rpl_stm_sp.result -> mysql-test/r/rpl_sp.result
BitKeeper/deleted/.del-rpl_row_sp000-master.opt~da625c0a51a2f08a:
  Delete: mysql-test/t/rpl_row_sp000-master.opt
BitKeeper/deleted/.del-rpl_row_sp000-slave.opt~d84baa1f59616d77:
  Delete: mysql-test/t/rpl_row_sp000-slave.opt
BitKeeper/deleted/.del-rpl_row_sp000.test~645e2807516682b6:
  Delete: mysql-test/t/rpl_row_sp000.test
BitKeeper/deleted/.del-rpl_row_sp000.result~2b24650b123e20a9:
  Delete: mysql-test/r/rpl_row_sp000.result
mysql-test/t/rpl_stm_mystery22.test:
  Test cleanip per lars
mysql-test/t/disabled.def:
  Test cleanip per lars
mysql-test/t/rpl_sp.test:
  Test cleanip per lars

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

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

- fix compile failure on QNX and FreeBSD


sql/event_executor.cc:
  time_t and my_time_t seem have the same length so cast
  in tztime.cc it's already done this way.
  Precautionary check at runtime about the sizes of my_time_t and time_t
sql/event_timed.cc:
  do time_t* cast to satisfy compilers on various platforms
  (QNX, FreeBSD)

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

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

storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  bugfix
storage/ndb/test/ndbapi/test_event_merge.cpp:
  continue

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

storage/ndb/src/kernel/blocks/dbtup/DbtupBuffer.cpp:
  Fix Sun compiler bug: does not recognize that foo(t *) and foo(t * const)
  are the same function.
storage/ndb/src/kernel/blocks/dbtup/DbtupFixAlloc.cpp:
  Fix Sun compiler bug: does not recognize that foo(t *) and foo(t * const)
  are the same function.
storage/ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp:
  Fix Sun compiler bug: does not recognize that foo(t *) and foo(t * const)
  are the same function.
storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  Fix Sun compiler bug: does not recognize that foo(t *) and foo(t * const)
  are the same function.
storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
  Fix Sun compiler bug: does not recognize that foo(t *) and foo(t * const)
  are the same function.
storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp:
  Add missing return value, otherwise Sun compiler complains.

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

  Added requested changes to test.


mysql-test/t/ndb_dd_ddl.test:
  Added requested changes to test.

into  mysql.com:/home/mydev/mysql-5.1-wl1563

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

fix INSERT/REPLACE statements so test suite runs again.
The question is why we have 2 parallel universes - 2 different
ways to start the test suite, a shell and perl version. One more case
where redundancy makes life nightmare.


scripts/mysql_create_system_tables.sh:
  fix INSERT/REPLACE statements so test suite runs again.
  The question is why we have 2 parallel universes - 2 different
  ways to start the test suite, a shell and perl version. One more case
  where redundancy makes life nightmare.

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

into  mysql.com:/home/mydev/mysql-5.1-wl1563

- add Event_priv to db and host tables


scripts/mysql_create_system_tables.sh:
  add event_priv to db and host. will fix failing tests too

into lmy004.:/work/tmp/mysql-5.1-new

BUILD/SETUP.sh:
  go back to -01 and reporting usage of uninitialized variables

into  mysql.com:/home/mydev/mysql-5.1-wl1563

into  perch.ndb.mysql.com:/home/jonas/src/51-new

BitKeeper/deleted/.del-ndb_error_reporter~48c84ad377571240:
  Delete: ndb/tools/ndb_error_reporter
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Release file from hash

  fix Suma get buffer ptr, adopt to new page pool in tup


storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  Fix new page pool usage
    previously it accepted page = base + RNIL, since it didnt use page anyway, sort of a prefetch...

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

into  perch.ndb.mysql.com:/home/jonas/src/51-new


storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Auto merged

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