diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2022-10-01 16:10:27 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2022-10-01 17:45:23 +0200 |
| commit | dd8833bff0af1b75e007e3db1d18debfb7c4a096 (patch) | |
| tree | 9fa7e479cd2af2aa1759a462a9edca0130feb4e3 | |
| parent | fa6d7e4e9897cd80dfddb855f4336fca4d002dcc (diff) | |
| download | mariadb-git-dd8833bff0af1b75e007e3db1d18debfb7c4a096.tar.gz | |
cleanup: suppress rocksdb compilation warning, fix a comment
| -rw-r--r-- | sql/sql_class.h | 4 | ||||
| -rw-r--r-- | storage/rocksdb/CMakeLists.txt | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index 7ef5e19a45d..7e06f0b0903 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -95,8 +95,8 @@ enum enum_slave_type_conversions { SLAVE_TYPE_CONVERSIONS_ALL_LOSSY, SLAVE_TYPE_CONVERSIONS_ALL_NON_LOSSY}; /* - MARK_COLUMNS_READ: A column is goind to be read. - MARK_COLUMNS_WRITE: A column is going to be written to. + COLUMNS_READ: A column is goind to be read. + COLUMNS_WRITE: A column is going to be written to. MARK_COLUMNS_READ: A column is goind to be read. A bit in read set is set to inform handler that the field is to be read. If field list contains duplicates, then diff --git a/storage/rocksdb/CMakeLists.txt b/storage/rocksdb/CMakeLists.txt index 0eca862aaa8..e0c1003b461 100644 --- a/storage/rocksdb/CMakeLists.txt +++ b/storage/rocksdb/CMakeLists.txt @@ -4,6 +4,8 @@ SET(CPACK_RPM_rocksdb-engine_PACKAGE_SUMMARY "RocksDB storage engine for MariaDB SET(CPACK_RPM_rocksdb-engine_PACKAGE_DESCRIPTION "The RocksDB storage engine is a high performance storage engine, aimed at maximising storage efficiency while maintaining InnoDB-like performance." PARENT_SCOPE) +MY_CHECK_AND_SET_COMPILER_FLAG(-Wno-range-loop-construct) + MACRO(SKIP_ROCKSDB_PLUGIN msg) MESSAGE_ONCE(SKIP_ROCKSDB_PLUGIN "Can't build rocksdb engine - ${msg}") ADD_FEATURE_INFO(ROCKSDB "OFF" "Storage Engine") |