include/myisam.h:
  Auto merged
sql/handler.h:
  Auto merged
sql/lex.h:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
include/my_base.h:
  merging
scripts/Makefile.am:
  merging
sql/handler.cc:
  merging
sql/share/errmsg.txt:
  merging
sql/sql_yacc.yy:
  merging

into mysql.com:/home/hf/work/mysql-5.1.w2645


mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged

into mysql.com:/home/hf/work/mysql-5.0.w2645


sql/sql_table.cc:
  Auto merged

necessary implementation in the server
mysql_upgrade script added


client/mysqlcheck.c:
  --check-upgrade option added
include/my_base.h:
  errcode added
include/myisam.h:
  option added
scripts/Makefile.am:
  mysql_upgrade script added
sql/handler.cc:
  checks for old types/bugs added
sql/handler.h:
  declarations regarding checks for upgrade
sql/lex.h:
  sym added
sql/share/errmsg.txt:
  error message added
sql/slave.cc:
  now ha_repair is for public use
sql/sql_table.cc:
  upgrade in ha_repair implemented
sql/sql_yacc.yy:
  CHECK ... FOR UPGRADE added to syntax

mysql-test/r/rpl_stm_log.result:
  Fixing test case

mysql-test/r/rpl_row_blob_innodb.result:
  Updated results files
mysql-test/r/rpl_row_blob_myisam.result:
  Updated results files

mysql-test/t/disabled.def:
  Updated
mysql-test/extra/rpl_tests/rpl_log.test:
  Updated and moved drop of tables to end of test to help bin log be more deterministic
mysql-test/r/rpl_row_log.result:
  Updated results
mysql-test/r/rpl_row_log_innodb.result:
  Updated results
mysql-test/r/rpl_ndb_log.result:
  Updated results

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


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

into  mysql.com:/home/mydev/mysql-5.0-bug8841

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

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

- also accept setting up binlog for tables in stateBackup

  Fix out of order options.


client/mysqlcheck.c:
  Fix out of order options.

mysql-test/t/ndb_dd_backuprestore.test:
  Updated with suggestions from Jonas
mysql-test/include/ndb_restore_master.inc:
  corrected issues with using cygwin to create
mysql-test/include/ndb_backup.inc:
  corrected issues with using cygwin to create

sql/ha_ndbcluster_binlog.cc:
  use_table at beginning of epoch
storage/ndb/include/ndbapi/Ndb.hpp:
  getGCIEventOperations: return distinct event ops at epoch start
storage/ndb/src/ndbapi/Ndb.cpp:
  getGCIEventOperations: return distinct event ops at epoch start
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  getGCIEventOperations: return distinct event ops at epoch start
storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp:
  getGCIEventOperations: return distinct event ops at epoch start

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

into serg.mylan:/usr/home/serg/Abk/mysql-5.1

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

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

into serg.mylan:/usr/home/serg/Abk/mysql-5.1


client/mysqldump.c:
  Auto merged

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


sql/sql_show.cc:
  Auto merged

into  mysql.com:/home/alexi/dev/mysql-5.1-wl3148


sql/sql_show.cc:
  Auto merged
sql/table.h:
  Auto merged

mysql-test/r/information_schema.result:
  Fixing results after PROCESSLIST information schema is added.
mysql-test/r/information_schema_db.result:
  Fixing results after PROCESSLIST information schema is added.
mysql-test/t/information_schema.test:
  Test case to check PROCESSLIST information schema.
    (Note that selecting other fields from PROCESSLIST
    can make the test unstable).
sql/sql_show.cc:
  Code for PROCESSLIST information schema
sql/table.h:
  Added for PROCESSLIST informarion schema

mysql-test/include/ndb_backup.inc:
  We are writting test cases that use the ndb backup. This new include contains all the code needed to start the backup and grab the backup ID for the test. By moving the code here it will be easy to reuse
mysql-test/include/ndb_restore_master.inc:
  We are writting test cases that use the ndb backup and restore. This new include contains all the code needed to restore a master cluster from the backup done with ndb_backup.inc. By moving the code here it will be easy to reuse
mysql-test/t/ndb_dd_backuprestore.test:
  Updated with suggestions from Jonas

| INTERVAL_VALUE | INTERVAL_FIELD |
| 20             | 20 MINUTE      |
the second one should be without the value


mysql-test/r/events.result:
  update test result to be as they should be
sql/event_timed.cc:
  manually append the name of the interval because it's no more appended
  by reconstruct_value

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

into  mysql.com:/home/mydev/mysql-5.0-bug8841

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


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

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

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

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

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


mysql-test/t/disabled.def:
  Merge

into  mysql.com:/home/mydev/mysql-5.0-bug8841

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


client/mysqltest.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
tests/mysql_client_test.c:
  Auto merged

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


mysys/thr_mutex.c:
  Auto merged

mysql-test/t/disabled.def:
  Disable ndb_load again...