diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-07-21 16:39:19 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-07-21 16:39:19 +0200 |
| commit | b7b5f6f1ab49948b0e15b762266d4640b3d6b7fb (patch) | |
| tree | 7c302c2025184dbd053aa6135f0ff28c8ce6f359 /storage/oqgraph | |
| parent | 5f6380adde2dac3f32b40339b9b702c0135eb7d6 (diff) | |
| parent | c1d6a2d7e194225ccc19a68ea5d0f368632620d0 (diff) | |
| download | mariadb-git-b7b5f6f1ab49948b0e15b762266d4640b3d6b7fb.tar.gz | |
10.0-monty merge
includes:
* remove some remnants of "Bug#14521864: MYSQL 5.1 TO 5.5 BUGS PARTITIONING"
* introduce LOCK_share, now LOCK_ha_data is strictly for engines
* rea_create_table() always creates .par file (even in "frm-only" mode)
* fix a 5.6 bug, temp file leak on dummy ALTER TABLE
Diffstat (limited to 'storage/oqgraph')
| -rw-r--r-- | storage/oqgraph/ha_oqgraph.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/storage/oqgraph/ha_oqgraph.cc b/storage/oqgraph/ha_oqgraph.cc index b4292f33066..c47c520335c 100644 --- a/storage/oqgraph/ha_oqgraph.cc +++ b/storage/oqgraph/ha_oqgraph.cc @@ -261,7 +261,7 @@ static int oqgraph_check_table_structure (TABLE *table_arg) if (!(field[0] == key->key_part[0].field && HA_KEY_ALG_HASH == key->algorithm)) DBUG_RETURN(-1); - if (key->key_parts == 3) + if (key->user_defined_key_parts == 3) { /* KEY (latch, origid, destid) USING HASH */ /* KEY (latch, destid, origid) USING HASH */ @@ -349,7 +349,7 @@ void ha_oqgraph::update_key_stats() if (key->algorithm != HA_KEY_ALG_BTREE) { if (key->flags & HA_NOSAME) - key->rec_per_key[key->key_parts-1]= 1; + key->rec_per_key[key->user_defined_key_parts-1]= 1; else { unsigned vertices= graph->vertices_count(); @@ -357,7 +357,7 @@ void ha_oqgraph::update_key_stats() uint no_records= vertices ? 2 * (edges + vertices) / vertices : 2; if (no_records < 2) no_records= 2; - key->rec_per_key[key->key_parts-1]= no_records; + key->rec_per_key[key->user_defined_key_parts-1]= no_records; } } } @@ -874,7 +874,7 @@ ha_rows ha_oqgraph::records_in_range(uint inx, key_range *min_key, /* Assert that info() did run. We need current statistics here. */ DBUG_ASSERT(key_stat_version == share->key_stat_version); - ha_rows result= key->rec_per_key[key->key_parts-1]; + ha_rows result= key->rec_per_key[key->user_defined_key_parts-1]; return result; } |