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


sql/ha_ndbcluster.cc:
  Auto merged

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


storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged

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


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

into  dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.0/bug21052


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

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

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

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


sql/ha_ndbcluster.cc:
  Auto merged

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


sql/ha_ndbcluster.cc:
  Auto merged
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-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.1/bug21052


sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
storage/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  dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.1/bug21052


storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  Manual merged

ndb/src/mgmclient/CommandInterpreter.cpp:
  Modify error message from "Start of backup failed" to "Backup failed" when backup is aborted
ndb/src/mgmsrv/Services.cpp:
  Append error message when error event occour
ndb/src/ndbapi/ndberror.c:
  Mofidy error message from "Backup aborted by applicaton" to "Backup aborted by user request"

into  dev3-138.dev.cn.tlan:/home/zhl/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-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.1/mysql-5.1-ndb-bj


sql/ha_ndbcluster.cc:
  Auto merged

into  dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.0/mysql-5.0-ndb-bj


ndb/src/mgmsrv/MgmtSrvr.cpp:
  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.

ignore the ndb injector thread when selecting from INFORMATION_SCHEMA.PROCESSLIST


mysql-test/r/events.result:
  don't select Daemon processes from I_S.PROCESSLIST (i.e. NDB Injector Thread)
mysql-test/r/events_bugs.result:
  don't select Daemon processes from I_S.PROCESSLIST (i.e. NDB Injector Thread)
mysql-test/t/events.test:
  don't select Daemon processes from I_S.PROCESSLIST (i.e. NDB Injector Thread)
mysql-test/t/events_bugs.test:
  don't select Daemon processes from I_S.PROCESSLIST (i.e. NDB Injector Thread)

into  qa3-104.qa.cn.tlan:/mnt/sda7/justin.he/mysql/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  qa3-104.qa.cn.tlan:/mnt/sda7/justin.he/mysql/mysql-5.1-ndb-bj


sql/ha_ndbcluster.cc:
  Auto merged

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


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

increase maximum length to 64 (max length that ndb injector creates is currently 62)


sql/sql_show.cc:
  Increase max length of I_S.PROCESSLIST.STATE to accomodate NDB injector strings.

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

make test ignore NDB injector thread


mysql-test/r/not_embedded_server.result:
  Use INFORMATION_SCHEMA for getting PROCESSLIST so we can exclude the
  NDB Binlog Injector thread as it may/may not be running depending on
  if --with-ndbcluster is specified to mysql-test-run
mysql-test/t/not_embedded_server.test:
  Use INFORMATION_SCHEMA for getting PROCESSLIST so we can exclude the
  NDB Binlog Injector thread as it may/may not be running depending on
  if --with-ndbcluster is specified to mysql-test-run

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