storage/ndb/include/kernel/AttributeHeader.hpp:
backport from 5.1-ndb-dd: AttributeHeader: store size in bytes
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
backport from 5.1-ndb-dd: AttributeHeader: store size in bytes
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
backport from 5.1-ndb-dd: AttributeHeader: store size in bytes
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
backport from 5.1-ndb-dd: AttributeHeader: store size in bytes
storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
backport from 5.1-ndb-dd: AttributeHeader: store size in bytes
storage/ndb/src/kernel/blocks/dbutil/DbUtil.cpp:
backport from 5.1-ndb-dd: AttributeHeader: store size in bytes
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
backport from 5.1-ndb-dd: AttributeHeader: store size in bytes
storage/ndb/src/kernel/blocks/trix/Trix.cpp:
backport from 5.1-ndb-dd: AttributeHeader: store size in bytes
storage/ndb/src/ndbapi/NdbOperationDefine.cpp:
backport from 5.1-ndb-dd: AttributeHeader: store size in bytes
storage/ndb/src/ndbapi/NdbOperationSearch.cpp:
backport from 5.1-ndb-dd: AttributeHeader: store size in bytes
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
backport from 5.1-ndb-dd: AttributeHeader: store size in bytes
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
configure.in:
Auto merged
include/my_global.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_show.cc:
Auto merged
storage/myisam/mi_test2.c:
Auto merged
mysql-test/r/ndb_basic.result:
wl#2624 re-commit due to bk problem
mysql-test/r/ndb_blob.result:
wl#2624 re-commit due to bk problem
mysql-test/r/ndb_charset.result:
wl#2624 re-commit due to bk problem
mysql-test/r/ndb_condition_pushdown.result:
wl#2624 re-commit due to bk problem
mysql-test/r/ndb_index_ordered.result:
wl#2624 re-commit due to bk problem
mysql-test/t/ndb_index_ordered.test:
wl#2624 re-commit due to bk problem
sql/ha_ndbcluster.cc:
wl#2624 re-commit due to bk problem
sql/ha_ndbcluster.h:
wl#2624 re-commit due to bk problem
sql/mysqld.cc:
wl#2624 re-commit due to bk problem
sql/set_var.cc:
wl#2624 re-commit due to bk problem
sql/sql_class.h:
wl#2624 re-commit due to bk problem
storage/ndb/include/kernel/AttributeHeader.hpp:
wl#2624 re-commit due to bk problem
storage/ndb/include/ndbapi/NdbDictionary.hpp:
wl#2624 re-commit due to bk problem
storage/ndb/include/ndbapi/NdbIndexScanOperation.hpp:
wl#2624 re-commit due to bk problem
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
wl#2624 re-commit due to bk problem
storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
wl#2624 re-commit due to bk problem
storage/ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
wl#2624 re-commit due to bk problem
storage/ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp:
wl#2624 re-commit due to bk problem
storage/ndb/src/kernel/blocks/dbtux/DbtuxTree.cpp:
wl#2624 re-commit due to bk problem
storage/ndb/src/kernel/blocks/dbtux/Makefile.am:
wl#2624 re-commit due to bk problem
storage/ndb/src/ndbapi/Makefile.am:
wl#2624 re-commit due to bk problem
storage/ndb/src/ndbapi/NdbDictionary.cpp:
wl#2624 re-commit due to bk problem
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
wl#2624 re-commit due to bk problem
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
wl#2624 re-commit due to bk problem
sql/mysql_priv.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_acl.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/table.h:
Auto merged
storage/ndb/src/common/portlib/NdbTCP.cpp:
Auto merged
storage/ndb/src/common/portlib/win32/NdbTCP.c:
Auto merged
into neptunus.(none):/home/msvensson/mysql/bug10713_new/my51-bug10713_new
mysql-test/mysql-test-run.sh:
Auto merged
sql/field.h:
Auto merged
sql/ha_federated.cc:
Auto merged
sql/ha_federated.h:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/item.cc:
Auto merged
sql/sp.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_help.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_udf.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
sql/table.h:
Auto merged
sql/tztime.cc:
Auto merged
sql/unireg.cc:
Auto merged
storage/ndb/src/ndbapi/SignalSender.cpp:
Auto merged
VC++Files/mysql.sln:
Manual merge 5.0 -> 5.1
scripts/make_win_src_distribution.sh:
Manual merge 5.0 -> 5.1
sql/field.cc:
Manual merge 5.0 -> 5.1
into eel.(none):/home/jonas/src/mysql-5.1-push
sql/ha_ndbcluster.cc:
Auto merged
storage/ndb/src/common/portlib/NdbThread.c:
Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
Auto merged
storage/ndb/test/include/NDBT_Test.hpp:
Auto merged
storage/ndb/test/ndbapi/Makefile.am:
Auto merged
storage/ndb/test/ndbapi/bank/Bank.cpp:
Auto merged
storage/ndb/test/ndbapi/bank/Bank.hpp:
Auto merged
storage/ndb/test/src/NDBT_Test.cpp:
Auto merged
storage/ndb/test/src/UtilTransactions.cpp:
Auto merged
configure.in:
Auto merged
client/mysqltest.c:
Auto merged
include/my_global.h:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
storage/ndb/src/ndbapi/SignalSender.cpp:
Auto merged
sql/sql_table.cc:
SCCS merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/ps_6bdb.result:
Auto merged
mysql-test/r/ps_7ndb.result:
Auto merged
mysys/default.c:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
storage/heap/hp_hash.c:
Auto merged
storage/ndb/include/util/Parser.hpp:
Auto merged
storage/ndb/src/common/portlib/NdbThread.c:
Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
Auto merged
storage/ndb/test/include/NDBT_Test.hpp:
Auto merged
storage/ndb/test/ndbapi/Makefile.am:
Auto merged
storage/ndb/test/ndbapi/bank/Bank.cpp:
Auto merged
storage/ndb/test/ndbapi/bank/Bank.hpp:
Auto merged
storage/ndb/test/src/NDBT_Test.cpp:
Auto merged
storage/ndb/test/src/UtilTransactions.cpp:
Auto merged
mysql-test/mysql-test-run.pl:
SCCS merged
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/redoLogReader/records.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/redoLogReader/records.hpp:
Auto merged
into eel.(none):/home/jonas/src/mysql-5.1-push
sql/set_var.cc:
Auto merged
sql/set_var.h:
Auto merged
sql/sql_show.cc:
Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
Auto merged
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
configure.in:
Auto merged
include/my_global.h:
Auto merged
sql/handler.cc:
Auto merged
sql/item.cc:
Auto merged
sql/log.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/set_var.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/examples/ha_tina.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_select.h:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
storage/ndb/include/kernel/signaldata/BackupImpl.hpp:
Auto merged
storage/ndb/include/kernel/signaldata/BackupSignalData.hpp:
Auto merged
storage/ndb/include/kernel/signaldata/NFCompleteRep.hpp:
Auto merged
storage/ndb/include/kernel/signaldata/NodeFailRep.hpp:
Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.hpp:
Auto merged
storage/ndb/src/kernel/main.cpp:
Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.hpp:
Auto merged
storage/ndb/src/ndbapi/Makefile.am:
Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
Auto merged
storage/ndb/test/src/NdbBackup.cpp:
Auto merged
5.1 has moved ndb into storage
storage/ndb/test/ndbapi/testSRBank.cpp:
Rename: ndb/test/ndbapi/testSRBank.cpp -> storage/ndb/test/ndbapi/testSRBank.cpp
into eel.(none):/home/jonas/src/mysql-5.1-push
sql/set_var.cc:
Auto merged
sql/set_var.h:
Auto merged
sql/sql_show.cc:
Auto merged
storage/ndb/src/common/portlib/NdbThread.c:
Auto merged
storage/ndb/test/include/NDBT_Test.hpp:
Auto merged
storage/ndb/test/ndbapi/Makefile.am:
Auto merged
storage/ndb/test/ndbapi/bank/Bank.cpp:
Auto merged
storage/ndb/test/ndbapi/bank/Bank.hpp:
Auto merged
storage/ndb/test/src/NDBT_Test.cpp:
Auto merged
storage/ndb/test/src/UtilTransactions.cpp:
Auto merged
into 127.(none):/home/osku/mysql/5.1/clean
sql/ha_innodb.cc:
Auto merged
storage/innobase/dict/dict0dict.c:
Auto merged
storage/innobase/include/dict0dict.h:
Auto merged
storage/innobase/include/row0mysql.h:
Auto merged
storage/innobase/row/row0mysql.c:
Auto merged
into eel.(none):/home/jonas/src/mysql-5.1-push
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
storage/ndb/tools/Makefile.am:
Auto merged
storage/ndb/tools/ndb_condig.cpp:
Auto merged
