into mysql.com:/home/jonas/src/mysql-5.1-push
mysql-test/t/ndb_partition_key.test:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
storage/ndb/include/mgmapi/mgmapi.h:
Auto merged
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.hpp:
Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
storage/ndb/tools/Makefile.am:
Auto merged
storage/ndb/tools/ndb_condig.cpp:
Auto merged
mysql-test/t/ndb_partition_key.test:
Fixed constant error codes, replaced with name of constant
mysql-test/t/partition_error.test:
Fixed constant error codes, replaced with name of constant
remove length of frm files as this is config dependant
mysql-test/r/ndb_partition_key.result:
remove length of frm files as this is config dependant
mysql-test/t/ndb_partition_key.test:
remove length of frm files as this is config dependant