mysql-test/mysql-test-run.sh:
  Auto merged

  Give space for second and third slave port


mysql-test/mysql-test-run.pl:
  Give space for second and third slave port
  Define shell variables for all ports, and
  list these at startup
mysql-test/mysql-test-run.sh:
  Give space for second and third slave port

  Display instance manager port
mysql-test-run.sh:
  Give port space for more than one slave


mysql-test/mysql-test-run.sh:
  Give port space for more than one slave
mysql-test/mysql-test-run.pl:
  Display instance manager port

mysql-test/mysql-test-run.sh:
  Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
mysql-test/mysql-test-run.pl:
  Rearranged the port numbers to fit into the range

into mysql.com:/Users/kent/mysql/bk/mysql-4.1

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0

into  poseidon.ndb.mysql.com:/home/tomas/mysql-4.1

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0


sql/ha_ndbcluster.h:
  Auto merged
mysql-test/r/ndb_basic.result:
  manual merge
mysql-test/t/ndb_basic.test:
  manual merge
sql/ha_ndbcluster.cc:
  manual merge

Bug #17257 ndb, update fails for inner joins if tables do not have Primary Key

change: the allocated area by setValue may not be around for later, store hidden key in special member variable instead


mysql-test/r/ndb_basic.result:
  Bug #17249 delete statement with join where clause fails when table do not have pk
  Bug #17257 update fails for inner joins if tables do not have Primary Key
mysql-test/t/ndb_basic.test:
  Bug #17249 delete statement with join where clause fails when table do not have pk
  Bug #17257 update fails for inner joins if tables do not have Primary Key
sql/ha_ndbcluster.cc:
  Bug #17249 delete statement with join where clause fails when table do not have pk
  Bug #17257 update fails for inner joins if tables do not have Primary Key
  
  change: the allocated area by setValue may not be around for later, store hidden key in special member variable instead
sql/ha_ndbcluster.h:
  Bug #17249 delete statement with join where clause fails when table do not have pk
  Bug #17257 update fails for inner joins if tables do not have Primary Key
  
  change: the allocated area by setValue may not be around for later, store hidden key in special member variable instead

into  mysql.com:/home/cps/mysql/devel/5.0-mike

into  mysql.com:/home/cps/mysql/devel/5.0-mike

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

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


ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged

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


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged

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

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


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged

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


ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged

  Introduce new variable c_newest_restorable_gci
    which is set _after_ both GCP_SAVE and COPY_GCI
    
  This variable is used when cutting redo (calcKeepGci)
  
  Also make sure complete GCI is run inbetween LCP's


ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Introduce new variable c_newest_restorable_gci
    which is set _after_ both GCP_SAVE and COPY_GCI
  
  This variable is used when cutting redo (calcKeepGci)
  Also make sure complete GCI is run inbetween LCP's
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Introduce new variable c_newest_restorable_gci
    which is set _after_ both GCP_SAVE and COPY_GCI
  
  This variable is used when cutting redo (calcKeepGci)
  Also make sure complete GCI is run inbetween LCP's

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


ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged

  fix corruption due to page 0, file 0 gets released


ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Make sure that page 0, file 0 isnt released

into  mysql.com:/home/cps/mysql/devel/5.0-mike

into  mysql.com:/usr/home/ram/work/5.0.b16511

mysql-test/r/im_life_cycle.result:
  correct result
mysql-test/t/im_life_cycle.imtest:
  check that wrong command is processed correctly
server-tools/instance-manager/Makefile.am:
  always look for passwords in /etc/ on unixes
server-tools/instance-manager/commands.cc:
  fix warning
server-tools/instance-manager/instance.cc:
  fix monitoring capabilities, when no port was specified
  for an instance
server-tools/instance-manager/instance_map.cc:
  allow relative paths in --defaults-file option
server-tools/instance-manager/mysqlmanager.cc:
  fix windows warning
server-tools/instance-manager/options.cc:
  add vars to allow relative paths in --defaults-file option
server-tools/instance-manager/options.h:
  add an option
server-tools/instance-manager/parse.cc:
  check for get_text_id return value
server-tools/instance-manager/portability.h:
  add _snprintf define, move platfrom-independent
  ifdefs to priv.h
server-tools/instance-manager/priv.cc:
  increase net timeout. it should be equal to mysqld's
server-tools/instance-manager/priv.h:
  move platform-independent ifdefs here

into  mysql.com:/usr/home/ram/work/mysql-5.0


mysql-test/t/heap.test:
  Auto merged
mysql-test/r/heap.result:
  merge

into  sanja.is.com.ua:/home/bell/mysql/bk/work-5.0

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


mysql-test/mysql-test-run.pl:
  Auto merged

mysql-test/mysql-test-run.pl:
  Set $using_ndbcluster_master to 1 if cluster is supported, to force a stop of old running cluster

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


mysql-test/mysql-test-run.pl:
  Auto merged

not needed by the tescases. This will save test time for those testcases
that does not need cluster, but need a restart, as they dont have to wait
the extra time it would take for cluster to restart. It will also save
time for other testcases, as cluster does not 
need to be contacted for each table to be dropped or created.
Backport from 5.1


mysql-test/lib/mtr_cases.pl:
  Mark all test cases where name contains "ndb" as ndbcluster needed
mysql-test/lib/mtr_match.pl:
  Add mtr_match_substring function
mysql-test/lib/mtr_stress.pl:
  Extre param to mysqld_start
mysql-test/mysql-test-run.pl:
  Only start ndbcluster for testcases that needs it.

into  sanja.is.com.ua:/home/bell/mysql/bk/work-5.0

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0

Removed 'delayed' to make the test deterministic (as the bug itself has nothing to do with 'delayed').

into  sanja.is.com.ua:/home/bell/mysql/bk/work-5.0

into  mysql.com:/usr/home/ram/work/5.0.b16511

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