make sure we can only drop files from correct file group


mysql-test/r/ndb_dd_ddl.result:
  add testcase
mysql-test/t/ndb_dd_ddl.test:
  add testcase
sql/ha_ndbcluster.cc:
  Make sure correct tablespace for dropping datafile
storage/ndb/include/ndbapi/NdbDictionary.hpp:
  Cleanup {data/undo}file get{tablespace/logfilegroup}
storage/ndb/src/ndbapi/NdbDictionary.cpp:
  Cleanup {data/undo}file get{tablespace/logfilegroup}
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Cleanup {data/undo}file get{tablespace/logfilegroup}
storage/ndb/tools/restore/consumer_restore.cpp:
  Cleanup {data/undo}file get{tablespace/logfilegroup}

  part 2 - handle safecounter.init() failing in all parts of event code


storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Handle out safecounter.init() failing
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  Dont try to get table RNIL
storage/ndb/test/ndbapi/test_event.cpp:
  Add testcase for subscribe/unscubscribe

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


storage/ndb/src/kernel/vm/RequestTracker.hpp:
  Auto merged
storage/ndb/src/kernel/vm/SafeCounter.hpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged

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


ndb/src/kernel/vm/SafeCounter.hpp:
  Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged

  part 1 - make sure return code is propagated from request tracker


ndb/src/kernel/vm/RequestTracker.hpp:
  propagate return value
ndb/src/kernel/vm/SafeCounter.hpp:
  make sure object is not initialized in case of seize() failure, to make sure destructor doesnt assert

  crash correct node in case of START_FRAGREF


storage/ndb/include/kernel/signaldata/SystemError.hpp:
  Add error code
storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Add error code
storage/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp:
  Add error code
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Add error code
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Add error code

  no DD when diskless


storage/ndb/include/kernel/signaldata/CreateFilegroup.hpp:
  New error code for create file when diskless
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  New error code for create file when diskless
storage/ndb/src/ndbapi/ndberror.c:
  New error code for create file when diskless

mysql-test/r/ndb_dd_ddl.result:
  fix so that result file is not dependant on local filesystem
mysql-test/t/ndb_dd_ddl.test:
  fix so that result file is not dependant on local filesystem

  set max value on ports


ndb/src/mgmsrv/ConfigInfo.cpp:
  set max vlue on ports

  create tablespace/logfile group should "back out changes"


mysql-test/r/ndb_dd_ddl.result:
  add testcase for bug#16341
mysql-test/t/ndb_dd_ddl.test:
  add testcase for bug#16341
sql/ha_ndbcluster.cc:
  If create data/undo file fails, check if filegroup is same version, and if it is drop it (wo/ checking error)
storage/ndb/include/kernel/signaldata/CreateFilegroup.hpp:
  add version to createfileconf
storage/ndb/include/ndbapi/NdbDictionary.hpp:
  Add NdbDictionary::ObjectId, that can be used to get [ id, version ] during create (only for DD object so far)
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  add version to createfileconf
storage/ndb/src/ndbapi/NdbDictionary.cpp:
  Add NdbDictionary::ObjectId, that can be used to get [ id, version ] during create (only for DD object so far)
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Add NdbDictionary::ObjectId, that can be used to get [ id, version ] during create (only for DD object so far)
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Add NdbDictionary::ObjectId, that can be used to get [ id, version ] during create (only for DD object so far)

  make sure tablename is release in case of alter table


storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  make sure tablename is release in case of alter table

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


storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged

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


ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged

  also close scan which are in "delivered" state, as it's impossible to release locks afterwards

  backport from 5.1


ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  ndb - bug#20197
    also close scan which are in "delivered" state, as it's impossible to release locks afterwards

  varpages did not get freed on drop table


storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Add continueb for freeing varpages
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  Add continueb for freeing varpages
storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  add dropping of varpages
storage/ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp:
  Add continueb for freeing varpages
storage/ndb/src/kernel/blocks/dbtup/DbtupVarAlloc.cpp:
  Add list of varpage chunks
storage/ndb/src/kernel/blocks/dbtup/tuppage.hpp:
  Add list of varpage chunks

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


storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged

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


ndb/src/kernel/blocks/ERROR_codes.txt:
  Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged
ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged

  add BUILD/compile-ndb-autotest to simplify building autotest on different mysql versions


BUILD/compile-ndb-autotest:
  New BitKeeper file ``BUILD/compile-ndb-autotest''

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

- add infinite retry on drop table temporary error


mysql-test/r/ndb_restore_partition.result:
  New BitKeeper file ``mysql-test/r/ndb_restore_partition.result''
mysql-test/t/ndb_restore_partition-master.opt:
  New BitKeeper file ``mysql-test/t/ndb_restore_partition-master.opt''
mysql-test/t/ndb_restore_partition.test:
  New BitKeeper file ``mysql-test/t/ndb_restore_partition.test''

mysql-test/r/create_not_windows.result:
  Update test result to use uppercase for keywords

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

into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19307

Removed non-static test case


mysql-test/r/partition_mgm.result:
  Removed non-static test case
mysql-test/t/partition_mgm.test:
  Removed non-static test case

into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19307


mysql-test/r/partition.result:
  Auto merged
mysql-test/t/partition.test:
  Auto merged
sql/partition_info.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/sql_partition.cc:
  Auto merged

into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new


BitKeeper/etc/ignore:
  auto-union
client/mysql.cc:
  Auto merged
include/config-win.h:
  Auto merged
include/my_global.h:
  Auto merged
mysql-test/r/create.result:
  Auto merged
mysql-test/t/create.test:
  Auto merged
sql/table.cc:
  Null-merged, as this doesn't apply after 5.1.4 .  -cm

into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new


include/my_sys.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Auto merged

mysql-test/r/partition.result:
  New test case
mysql-test/t/partition.test:
  New test case
sql/partition_info.cc:
  Disable CSV engine for partitioned tables
sql/share/errmsg.txt:
  Update error message for more flexibility
sql/sql_partition.cc:
  Editing fixes

into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19305

into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19305


mysql-test/r/partition_range.result:
  Auto merged
sql/mysql_priv.h:
  Auto merged
mysql-test/r/partition.result:
  manual merge
mysql-test/t/partition.test:
  manual merge
sql/sql_partition.cc:
  manual merge

into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19122


mysql-test/r/partition.result:
  Auto merged
mysql-test/t/partition.test:
  Auto merged
sql/lock.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_partition.cc:
  Auto merged

Fixed comments


sql/sql_partition.cc:
  Fixed comments

BUG#19122: Need to close all handlers before rename/drop phase in ALTER TABLE ADD/DROP/REORGANIZE partitions
After review fix


mysql-test/r/partition.result:
  Fixes for test
mysql-test/t/partition.test:
  Fixes for test
sql/lock.cc:
  After review fix
sql/mysql_priv.h:
  After review fix
sql/sql_partition.cc:
  After review fix

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

into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19305


sql/sql_partition.cc:
  Auto merged

into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19695


BitKeeper/deleted/.del-ndb_partition_key.result~68b9a59cff8c9840:
  Auto merged
mysql-test/r/partition.result:
  manual merge
mysql-test/r/partition_02myisam.result:
  manual merge
mysql-test/t/partition.test:
  manual merge
sql/sql_partition.cc:
  manual merge
sql/sql_partition.h:
  manual merge
sql/sql_show.cc:
  manual merge
sql/sql_table.cc:
  manual merge

into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19305


sql/ha_partition.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_partition.cc:
  Auto merged