summaryrefslogtreecommitdiff
path: root/storage/rocksdb/ha_rocksdb.h
diff options
context:
space:
mode:
authorSergei Petrunia <psergey@askmonty.org>2016-12-02 15:35:36 +0000
committerSergei Petrunia <psergey@askmonty.org>2016-12-02 15:35:36 +0000
commit59d76665eed69974da81cdccba2df9f26b4e0967 (patch)
tree2c174086686f75cc3364c40788916b1e2c8025ee /storage/rocksdb/ha_rocksdb.h
parentf2219fe94d1da1da59cb39784e04ffb587c37c91 (diff)
downloadmariadb-git-59d76665eed69974da81cdccba2df9f26b4e0967.tar.gz
MariaRocks port: Return correct value of HA_PRIMARY_KEY_IN_READ_INDEX flag
This cset just re-uses the approach from facebook/mysql-5.6 (Perhaps we will have something different for MariaDB in the end). For now this is: Port this fix dd7eeae69503cb8ab6ddc8fd9e2fef451cc31a32 Issue#250: MyRocks/Innodb different output from query with order by on table with index and decimal type Summary: Make open_binary_frm() set TABLE_SHARE::primary_key before it computes Also add the patch for https://github.com/facebook/mysql-5.6/issues/376
Diffstat (limited to 'storage/rocksdb/ha_rocksdb.h')
-rw-r--r--storage/rocksdb/ha_rocksdb.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/rocksdb/ha_rocksdb.h b/storage/rocksdb/ha_rocksdb.h
index 0c6034705a7..63c8683daab 100644
--- a/storage/rocksdb/ha_rocksdb.h
+++ b/storage/rocksdb/ha_rocksdb.h
@@ -592,9 +592,9 @@ public:
HA_PARTIAL_COLUMN_READ |
HA_TABLE_SCAN_ON_INDEX;
}
-#ifdef MARIAROCKS_NOT_YET
+//#ifdef MARIAROCKS_NOT_YET
bool init_with_fields() override;
-#endif
+//#endif
/** @brief
This is a bitmap of flags that indicates how the storage engine
implements indexes. The current index flags are documented in