diff options
| author | unknown <tomas@whalegate.ndb.mysql.com> | 2007-04-26 13:50:04 +0200 |
|---|---|---|
| committer | unknown <tomas@whalegate.ndb.mysql.com> | 2007-04-26 13:50:04 +0200 |
| commit | da719b3dab64b1801cb490fae79528a682105bae (patch) | |
| tree | 73aa9e01899355690137cfd5b2260885865c03a8 /mysql-test/r/ndb_partition_key.result | |
| parent | 9eb496dabecda510517cbad80b8376bc6d5f9210 (diff) | |
| parent | 10d2d90063fa20b4c96646783da7d7369f632f3d (diff) | |
| download | mariadb-git-da719b3dab64b1801cb490fae79528a682105bae.tar.gz | |
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
storage/ndb/include/kernel/signaldata/DictTabInfo.hpp:
Auto merged
storage/ndb/include/ndbapi/NdbDictionary.hpp:
Auto merged
storage/ndb/src/common/debugger/signaldata/DictTabInfo.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
Auto merged
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/dbtup/Dbtup.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupFixAlloc.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbDictionary.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
Auto merged
storage/ndb/test/include/HugoOperations.hpp:
Auto merged
storage/ndb/test/ndbapi/testBasic.cpp:
Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
Auto merged
storage/ndb/test/src/HugoOperations.cpp:
Auto merged
mysql-test/r/ndb_partition_key.result:
manual merge
sql/ha_ndbcluster.cc:
manual merge
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
manual merge
storage/ndb/test/src/NDBT_Table.cpp:
manual merge
Diffstat (limited to 'mysql-test/r/ndb_partition_key.result')
| -rw-r--r-- | mysql-test/r/ndb_partition_key.result | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/r/ndb_partition_key.result b/mysql-test/r/ndb_partition_key.result index 685137b7710..60e96ce03b6 100644 --- a/mysql-test/r/ndb_partition_key.result +++ b/mysql-test/r/ndb_partition_key.result @@ -58,6 +58,7 @@ Length of frm data: # Row Checksum: 1 Row GCI: 1 SingleUserMode: 0 +ForceVarPart: 1 TableStatus: Retrieved -- Attributes -- a Int PRIMARY KEY AT=FIXED ST=MEMORY |