diff options
| author | unknown <tomas@poseidon.ndb.mysql.com> | 2006-06-27 14:56:20 +0200 |
|---|---|---|
| committer | unknown <tomas@poseidon.ndb.mysql.com> | 2006-06-27 14:56:20 +0200 |
| commit | cee3b44dff72b3e81f8fa878485d3c45af16e9d5 (patch) | |
| tree | a6ecce16c1ca82dd575320cee7d9b28056c5dba3 /sql | |
| parent | 25652349e9519d85e6df1953050d3f2351225b1d (diff) | |
| parent | d2da3c9685d1105f7e021c9b05b2b0248135a897 (diff) | |
| download | mariadb-git-cee3b44dff72b3e81f8fa878485d3c45af16e9d5.tar.gz | |
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
mysql-test/mysql-test-run.sh:
Auto merged
ndb/include/kernel/GlobalSignalNumbers.h:
Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/ha_ndbcluster.cc | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc index 46ab5b88624..a955bc44721 100644 --- a/sql/ha_ndbcluster.cc +++ b/sql/ha_ndbcluster.cc @@ -4116,7 +4116,11 @@ static int create_ndb_column(NDBCOL &col, static void ndb_set_fragmentation(NDBTAB &tab, TABLE *form, uint pk_length) { - if (form->s->max_rows == (ha_rows) 0) /* default setting, don't set fragmentation */ + 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 */ return; /** * get the number of fragments right @@ -4134,7 +4138,6 @@ static void ndb_set_fragmentation(NDBTAB &tab, TABLE *form, uint pk_length) acc_row_size+= 4 + /*safety margin*/ 4; #endif ulonglong acc_fragment_size= 512*1024*1024; - ulonglong max_rows= form->s->max_rows; #if MYSQL_VERSION_ID >= 50100 no_fragments= (max_rows*acc_row_size)/acc_fragment_size+1; #else @@ -4158,6 +4161,8 @@ static void ndb_set_fragmentation(NDBTAB &tab, TABLE *form, uint pk_length) ftype= NDBTAB::FragAllSmall; tab.setFragmentType(ftype); } + tab.setMaxRows(max_rows); + tab.setMinRows(min_rows); } int ha_ndbcluster::create(const char *name, |