diff options
| author | Rich Prohaska <prohaska@tokutek.com> | 2013-08-05 10:07:47 -0400 |
|---|---|---|
| committer | Rich Prohaska <prohaska@tokutek.com> | 2013-08-05 10:07:47 -0400 |
| commit | a43124c1e585bb8d150030530e508f2b054999f8 (patch) | |
| tree | 489eb53281de38b0473e55454a1e98594d7a4705 /storage | |
| parent | ff22d3cc5a0f2cb3d1d4fc66f1580412b8113901 (diff) | |
| download | mariadb-git-a43124c1e585bb8d150030530e508f2b054999f8.tar.gz | |
#58 #62 ignore key block size settings for tokudb. use session variables instead.
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/tokudb/ha_tokudb.cc | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/storage/tokudb/ha_tokudb.cc b/storage/tokudb/ha_tokudb.cc index 4060328bfaf..7bd0b2688cb 100644 --- a/storage/tokudb/ha_tokudb.cc +++ b/storage/tokudb/ha_tokudb.cc @@ -6803,10 +6803,7 @@ int ha_tokudb::create_secondary_dictionary( ); assert(row_descriptor.size <= max_row_desc_buff_size); - block_size = key_info->block_size << 10; - if (block_size == 0) { - block_size = get_tokudb_block_size(thd); - } + block_size = get_tokudb_block_size(thd); read_block_size = get_tokudb_read_block_size(thd); error = create_sub_table(newname, &row_descriptor, txn, block_size, read_block_size, row_type_to_compression_method(row_type), is_hot_index); @@ -6896,12 +6893,7 @@ int ha_tokudb::create_main_dictionary(const char* name, TABLE* form, DB_TXN* txn ); assert(row_descriptor.size <= max_row_desc_buff_size); - block_size = 0; - if (prim_key) - block_size = prim_key->block_size << 10; - if (block_size == 0) { - block_size = get_tokudb_block_size(thd); - } + block_size = get_tokudb_block_size(thd); read_block_size = get_tokudb_read_block_size(thd); /* Create the main table that will hold the real rows */ |