diff options
| author | unknown <tomas@poseidon.ndb.mysql.com> | 2006-06-27 11:22:42 +0200 |
|---|---|---|
| committer | unknown <tomas@poseidon.ndb.mysql.com> | 2006-06-27 11:22:42 +0200 |
| commit | 6848be9cc2de93a840352db953ef9d88b600c01d (patch) | |
| tree | 6996a3c97fd5e7cd58e54c130547fe0dc451a05d /sql/ha_ndbcluster.cc | |
| parent | 98ba03d22653612d7da73696de6df0b137e21182 (diff) | |
| parent | 0335013f17743299cf32731e1db986170672acbe (diff) | |
| download | mariadb-git-6848be9cc2de93a840352db953ef9d88b600c01d.tar.gz | |
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
mysql-test/mysql-test-run.sh:
Auto merged
storage/ndb/include/kernel/signaldata/BackupContinueB.hpp:
Auto merged
storage/ndb/include/kernel/signaldata/BackupImpl.hpp:
Auto merged
storage/ndb/include/kernel/signaldata/BackupSignalData.hpp:
Auto merged
storage/ndb/include/ndbapi/NdbDictionary.hpp:
Auto merged
storage/ndb/src/common/debugger/signaldata/BackupImpl.cpp:
Auto merged
storage/ndb/src/common/debugger/signaldata/BackupSignalData.cpp:
Auto merged
storage/ndb/src/common/debugger/signaldata/LqhFrag.cpp:
Auto merged
storage/ndb/src/kernel/blocks/backup/BackupFormat.hpp:
Auto merged
storage/ndb/src/kernel/blocks/backup/BackupInit.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp:
Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.hpp:
Auto merged
sql/ha_ndbcluster.cc:
manual merge
storage/ndb/include/kernel/GlobalSignalNumbers.h:
manual merge
storage/ndb/include/kernel/signaldata/DictTabInfo.hpp:
manual merge
storage/ndb/include/kernel/signaldata/LqhFrag.hpp:
manual merge
storage/ndb/include/kernel/signaldata/TupFrag.hpp:
manual merge
storage/ndb/src/common/debugger/signaldata/DictTabInfo.cpp:
manual merge
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
manual merge
storage/ndb/src/kernel/blocks/backup/Backup.hpp:
manual merge
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
manual merge
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
manual merge
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
manual merge
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
manual merge
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
manual merge
storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
manual merge
storage/ndb/src/ndbapi/NdbDictionary.cpp:
manual merge
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
manual merge
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
manual merge
storage/ndb/tools/restore/Restore.cpp:
manual merge
storage/ndb/tools/restore/Restore.hpp:
manual merge
storage/ndb/tools/restore/consumer_restore.cpp:
manual merge
Diffstat (limited to 'sql/ha_ndbcluster.cc')
| -rw-r--r-- | sql/ha_ndbcluster.cc | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc index 2705436553d..5e4b65f766e 100644 --- a/sql/ha_ndbcluster.cc +++ b/sql/ha_ndbcluster.cc @@ -9879,7 +9879,17 @@ uint ha_ndbcluster::set_up_partition_info(partition_info *part_info, } while (++i < part_info->no_parts); tab->setDefaultNoPartitionsFlag(part_info->use_default_no_partitions); tab->setLinearFlag(part_info->linear_hash_ind); - tab->setMaxRows(table->s->max_rows); + { + ha_rows max_rows= form->s->max_rows; + ha_rows min_rows= form->s->min_rows; + if (max_rows < min_rows) + max_rows= min_rows; + if (max_rows != (ha_rows)0) /* default setting, don't set fragmentation */ + { + tab->setMaxRows(max_rows); + tab->setMaxRows(min_rows); + } + } tab->setTablespaceNames(ts_names, fd_index*sizeof(char*)); tab->setFragmentCount(fd_index); tab->setFragmentData(&frag_data, fd_index*2); |