into  dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.1-ndb-bj


sql/ha_ndbcluster.cc:
  Auto merged

into  dev3-76.dev.cn.tlan:/home/lisj/mysql/mysql-5.1/mysql-5.1-bug19047


storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
storage/ndb/src/mgmclient/main.cpp:
  Auto merged
storage/ndb/src/mgmclient/ndb_mgmclient.hpp:
  Auto merged

ndb/src/mgmclient/CommandInterpreter.cpp:
  Not start event thread when ndb_mgm client is running in executing (-e) mode.
ndb/src/mgmclient/main.cpp:
  Not start event thread when ndb_mgm is runing in executing (-e) mode.
ndb/src/mgmclient/ndb_mgmclient.hpp:
  Not start event thread when ndb_mgm is running in executing (-e) mode.

into  dev3-76.dev.cn.tlan:/home/lisj/mysql/mysql-5.1/mysql-5.1-ndb-bj


sql/sql_base.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged

into  dev3-76.dev.cn.tlan:/home/lisj/mysql/mysql-5.1/mysql-5.1-ndb-bj


sql/ha_ndbcluster.cc:
  Auto merged

into  dev3-76.dev.cn.tlan:/home/lisj/mysql/mysql-5.0/mysql-5.0-ndb-bj


ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged

into  dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.1-ndb-bj


sql/ha_ndbcluster.cc:
  Auto merged

into  willster.(none):/home/stewart/Documents/MySQL/5.1/ndb

make test work both with and without ndbcluster


mysql-test/r/information_schema.result:
  fix test so that it passes --with-ndbcluster
  
  add conditions to ignore the table_schema='cluster' on some queries as different
  tables are in the cluster database if ndb is running or not.
mysql-test/t/information_schema.test:
  ignore the 'cluster' database as results differ if --with-ndbcluster or without
  
  explictly use schema 'test' for bug7476 check.

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

  Fix ndb_condition_pushdown (5.0->5.1 merge error)


storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Fix ndb_condition_pushdown

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

  Fix build failure if O_DIRECT is not defined
  Fix stack overflow by making odirect_readbuf global
  Remove soem old debug variables


storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
  Fix build failure if O_DIRECT is not defined
  Fix stack overflow by making odirect_readbuf global
  Remove soem old debug variables
storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp:
  Fix build failure if O_DIRECT is not defined
  Fix stack overflow by making odirect_readbuf global
  Remove soem old debug variables

into  willster.(none):/home/stewart/Documents/MySQL/5.1/ndb


storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.hpp:
  Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  manual merge
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  manual merge
storage/ndb/src/ndbapi/ClusterMgr.cpp:
  manual merge
storage/ndb/src/ndbapi/ClusterMgr.hpp:
  manual merge

into  willster.(none):/home/stewart/Documents/MySQL/5.1/ndb


mysql-test/t/disabled.def:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged

into  willster.(none):/home/stewart/Documents/MySQL/5.0/ndb

  
few cases not handled properly (NF occurs).


ndb/src/kernel/blocks/backup/Backup.cpp:
  Don't write fragment info if we haven't retreived any fragment info yet
  (FailMaster test 2)
      
  Go directly onto closing files if the tabPtr is RNIL (as we're in recovery)

into  qa3-104.qa.cn.tlan:/mnt/sda7/justin.he/mysql/mysql-5.1-ndb-bj

mysql-test/r/mysqldump.result:
  Merge result fix
mysql-test/r/repair.result:
  Merge Result Fix
mysql-test/t/mysqldump.test:
  Fix of test

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


client/mysql.cc:
  Auto merged
mysql-test/r/grant.result:
  Auto merged
mysql-test/r/grant2.result:
  Auto merged
mysql-test/r/heap_btree.result:
  Auto merged
mysql-test/t/grant.test:
  Auto merged
mysql-test/t/grant2.test:
  Auto merged
mysql-test/t/mysqlbinlog.test:
  Auto merged
mysql-test/t/repair.test:
  Auto merged
scripts/fill_func_tables.sh:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
storage/heap/hp_delete.c:
  Auto merged
storage/myisam/mi_update.c:
  Auto merged
storage/myisam/sort.c:
  Auto merged
mysql-test/r/mysqldump.result:
  Fixing Result
mysql-test/r/repair.result:
  Fixing result
mysql-test/t/mysqldump.test:
  Merging change
storage/archive/ha_archive.cc:
  Merging in change

into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge

scripts/make_binary_distribution.sh:
  Drop the "max" server from 5.1 packages.

into  zim.(none):/home/brian/mysql/dep-5.0

mysql-test/r/mysqldump.result:
  Update results.
mysql-test/t/mysqldump.test:
  Fix a bug in the test case that left user mysqltest_1@localhost 
  around (this broke furhter tests).

mysql-test/r/partition_grant.result:
  Update results (cleanup pon top of partition_grant.test)

  5.1-fix adopt to changes in node recovery


storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  ix totSendLenAi also in "new" node recovery

into  may.pils.ru:/home/svoj/devel/mysql/BUG18874/mysql-5.0


myisam/sort.c:
  Auto merged
mysql-test/r/repair.result:
  Auto merged
mysql-test/t/repair.test:
  Auto merged

into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge


sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
sql/sql_db.cc:
  Manual merge.
sql/sql_show.cc:
  Manual merge.
sql/sql_table.cc:
  Manual merge.

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


storage/ndb/include/ndbapi/NdbOperation.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupPagMan.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
storage/ndb/src/mgmapi/ndb_logevent.cpp:
  Auto merged
storage/ndb/test/ndbapi/testIndex.cpp:
  Auto merged
storage/ndb/test/ndbapi/testSystemRestart.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  merge
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  merge
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  merge
storage/ndb/test/run-test/daily-basic-tests.txt:
  merge

Fixed by moving update_key_parts() down to be after write_index().


myisam/sort.c:
  write_index() collects index statistic which is further used in
  update_key_parts(). Thus update_key_parts() must be called after
  write_index().
mysql-test/r/repair.result:
  Test case for bug#18874.
mysql-test/t/repair.test:
  Test case for bug#18874.

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

ndb/src/mgmsrv/ConfigInfo.cpp:
  add maximum node number judging in transformNode
ndb/src/mgmsrv/MgmtSrvr.cpp:
  if configure filename isnot null, display it

Fix for bug#20648 We introduce a new field method for knowing "real size", and we now in archive null unused bits of a row to null before writing. 


sql/field.cc:
  data_length for field needs to be calculated directly.
sql/field.h:
  The new method data_length() returns the "real" length of the field.
sql/ha_archive.cc:
  Before a write_row() archive nulls space beyond the size of the row in varchars to make sure that compression only sees NULL.

into  perch.ndb.mysql.com:/home/jonas/src/50-work


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged

client/mysqldump.c:
  A post-merge fix - 'sock' was renamed to 'mysql'
mysql-test/r/events_bugs.result:
  A post merge fix: now we strip rear comments from the query before
  it gets into the log.
mysql-test/r/func_group.result:
  A post merge fix: default clause is now printed uppercase.
mysql-test/r/im_life_cycle.result:
  Fix my mistake in manual resolve.
mysql-test/r/mysqlcheck.result:
  use test; - after we drop client_test_db there is no current database.
  This cleanup is present in 5.1 only, but the test that was added in 
  5.0 assumes there is a current database, test.
mysql-test/r/mysqldump.result:
  Ignore results of execution of mysqldump: we can't rely on 
  MASTER_LOG_POS in test results, it's different for statement
  and row level logging.
mysql-test/r/mysqlshow.result:
  A post-merge fix: information schema contains a few more tables
  in 5.1
mysql-test/r/mysqltest.result:
  A post merge fix: add 5.1 test end separator.
mysql-test/r/ndb_basic.result:
  A post-merge fix: add test end separators.
mysql-test/r/rpl_switch_stm_row_mixed.result:
  A post merge fix: length of varbinary column is now 3 times less.
  Assuming a side effect of some other change. Length of any
  field is not relevant in this test.
mysql-test/r/rpl_view.result:
  Add an end of test marker.
mysql-test/r/show_check.result:
  Remove duplicate results. Add results from a merged test case.
mysql-test/r/sp-error.result:
  Add test end separators.
mysql-test/r/sp-security.result:
  Post-merge fix: use test after the current database is dropped.
mysql-test/r/sp.result:
  Remove a duplicate result (bad merge that left a copy of
  the test case for Bug#19862 in the test suite).
mysql-test/r/strict.result:
  An after-merge fix for a new test case: in 5.1 we issue a more accurate
  error message: "Incorrect value" instead of "Truncated value". I reason
  it so that in case of an error nothing is truncated, really.
  Also found similar changes in other test cases.
mysql-test/r/type_datetime.result:
  Fix the text of an error.
mysql-test/r/union.result:
  A post-merge fix: CHARACTER SET is now uppercase.
mysql-test/t/mysqlcheck.test:
  A post-merge fix: use test, after current database is dropped, there
  is no current database.
mysql-test/t/mysqldump.test:
  Disable result log: it's dependent on binlog position.
mysql-test/t/sp-security.test:
  use test
sql/item_sum.cc:
  Adjust the call to the constructor after the merge.
sql/sp_head.cc:
  Add a missing DBUG_VOID_RETURN, move security checks out of
  execute_trigger to Table_triggers_list: in 5.1 we check for
  TRIGGER privilege, not SUPER privilege to execute triggers, so these
  checks lack table context inside execute_trigger and have to be
  performed when we have table object on hand.
sql/sql_db.cc:
  A post-merge fix: adjust load_db_opt_by_name and check_db_dir_existence
  (new functions added in 5.0) to be tablename-to-filename encoding 
  friendly.
sql/sql_lex.cc:
  A post-merge fix: make skip_rear_comments operate on const uchar *s.
sql/sql_lex.h:
  A post-merge fix.
sql/sql_show.cc:
  A post-merge fix: fix a bad merge, rename orig_sql_command -> sql_command.
sql/sql_trigger.cc:
  A post-merge fix: move security checks to process_triggers
  from execute_trigger.
sql/sql_view.cc:
  Adjust to the new signature of skip_rear_comments.
sql/sql_yacc.yy:
  Adjust to the new signature of init_strings.

into  qa3-104.qa.cn.tlan:/mnt/sda7/justin.he/mysql/mysql-5.0-ndb-bj


sql/sql_base.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged

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

into  qa3-104.qa.cn.tlan:/mnt/sda7/justin.he/mysql/mysql-5.0-ndb-bj


sql/sql_base.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged