diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-04-14 07:54:43 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-04-14 07:54:43 +0300 |
commit | ef26a304869be71099708cf7139ff60a0d4e48a3 (patch) | |
tree | 5043661eb9e3a0eebcf909aa1d417a76c9ebe441 /CMakeLists.txt | |
parent | b8c8692fd93b68df8f70db5ffab82ed0d67008b3 (diff) | |
parent | 55a7682a30963c1ee5e367d9f3b9b2e50e12d663 (diff) | |
download | mariadb-git-ef26a304869be71099708cf7139ff60a0d4e48a3.tar.gz |
Merge 10.2 into 10.3
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r-- | CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 14a770632ec..b7aa6ca5386 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ # Copyright (c) 2006, 2017, Oracle and/or its affiliates. -# Copyright (c) 2008, 2020, MariaDB Corporation. +# Copyright (c) 2008, 2021, MariaDB Corporation. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -127,7 +127,7 @@ ENDIF() # NUMA SET(WITH_NUMA "AUTO" CACHE STRING "Build with non-uniform memory access, allowing --innodb-numa-interleave. Options are ON|OFF|AUTO. ON = enabled (requires NUMA library), OFF = disabled, AUTO = enabled if NUMA library found.") -SET(MYSQL_MAINTAINER_MODE "AUTO" CACHE STRING "MySQL maintainer-specific development environment. Options are: ON OFF AUTO.") +SET(MYSQL_MAINTAINER_MODE "AUTO" CACHE STRING "Enable MariaDB maintainer-specific warnings. One of: NO (warnings are disabled) WARN (warnings are enabled) ERR (warnings are errors) AUTO (warnings are errors in Debug only)") # Packaging IF (NOT CPACK_GENERATOR) |