diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-03-13 10:21:00 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-03-31 19:22:19 +0200 |
| commit | 63798a6ea8bb9074919ba0025074200bce6f940f (patch) | |
| tree | dd8940582aca55c54ed8e85d1f171c8a765c711e | |
| parent | dd3b7ad10f8c994f91ef5f49728432e7b95507cf (diff) | |
| download | mariadb-git-63798a6ea8bb9074919ba0025074200bce6f940f.tar.gz | |
remove DB_TYPE_ROCKSDB
| -rw-r--r-- | sql/handler.h | 3 | ||||
| -rw-r--r-- | storage/rocksdb/ha_rocksdb.cc | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/sql/handler.h b/sql/handler.h index c418429d10c..028f40e5dab 100644 --- a/sql/handler.h +++ b/sql/handler.h @@ -434,8 +434,7 @@ enum legacy_db_type DB_TYPE_PERFORMANCE_SCHEMA=28, DB_TYPE_ARIA=42, DB_TYPE_TOKUDB=43, - DB_TYPE_ROCKSDB=44, - DB_TYPE_FIRST_DYNAMIC=45, + DB_TYPE_FIRST_DYNAMIC=44, DB_TYPE_DEFAULT=127 // Must be last }; /* diff --git a/storage/rocksdb/ha_rocksdb.cc b/storage/rocksdb/ha_rocksdb.cc index 06b82dd2dc6..25f42db82f3 100644 --- a/storage/rocksdb/ha_rocksdb.cc +++ b/storage/rocksdb/ha_rocksdb.cc @@ -3304,7 +3304,6 @@ static int rocksdb_init_func(void *const p) { rocksdb_hton->recover = rocksdb_recover; rocksdb_hton->commit = rocksdb_commit; rocksdb_hton->rollback = rocksdb_rollback; - rocksdb_hton->db_type = DB_TYPE_ROCKSDB; rocksdb_hton->show_status = rocksdb_show_status; rocksdb_hton->start_consistent_snapshot = rocksdb_start_tx_and_assign_read_view; |