diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-12-14 13:44:30 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-12-14 13:52:13 +0200 |
| commit | dbb39a778d43bb69c6dccbf6f6000010860d1850 (patch) | |
| tree | 82035cb92fd187fd24b61abb334edbd57da7584b /extra/CMakeLists.txt | |
| parent | c1caada886270567bfc9d4f57f5ea40d31dd56ea (diff) | |
| download | mariadb-git-dbb39a778d43bb69c6dccbf6f6000010860d1850.tar.gz | |
MDEV-17958: Make innochecksum follow the build option
Innochecksum was being built as if WITH_INNODB_BUG_ENDIAN_CRC32:BOOL=OFF
had been specified.
Also, clean up tests:
innodb.innochecksum: Useless; superceded by innodb_zip.innochecksum.
innodb.innodb_zip_innochecksum: Remove; duplicated innodb_zip.innochecksum.
innodb.innodb_zip_innochecksum2: Remove; duplicated innodb_zip.innochecksum_2.
innodb.innodb_zip_innochecksum3: Remove; duplicated innodb_zip.innochecksum_3.
No test case was added. I tested manually by adding debug instrumentation
to both innochecksum and buf_page_is_checksum_valid_crc32() to make
innochecksum write the buggy crc32, and to get warnings for falling back
to the buggy checksum. Automating this would require that tests be
adjusted depending on the build options.
Diffstat (limited to 'extra/CMakeLists.txt')
| -rw-r--r-- | extra/CMakeLists.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/extra/CMakeLists.txt b/extra/CMakeLists.txt index 136a802d1ba..13d3e9ddb41 100644 --- a/extra/CMakeLists.txt +++ b/extra/CMakeLists.txt @@ -72,6 +72,9 @@ IF(WITH_INNOBASE_STORAGE_ENGINE OR WITH_XTRADB_STORAGE_ENGINE) # We use the InnoDB code directly in case the code changes. ADD_DEFINITIONS("-DUNIV_INNOCHECKSUM") + IF(WITH_INNODB_BUG_ENDIAN_CRC32) + ADD_DEFINITIONS(-DINNODB_BUG_ENDIAN_CRC32) + ENDIF() # Avoid generating Hardware Capabilities due to crc32 instructions IF(CMAKE_SYSTEM_NAME MATCHES "SunOS" AND CMAKE_SYSTEM_PROCESSOR MATCHES "i386") |