summaryrefslogtreecommitdiff
path: root/config.h.cmake
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2022-10-11 15:18:49 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2022-10-11 15:18:49 +0300
commit7434eb566e2cb832d7798196d50629dcaa1d7f79 (patch)
tree1c3c4a81c763d385e1bfea2ab5cfe6ea619c86b3 /config.h.cmake
parent3f5b03c415662135257a4ae9bc525fd72a795872 (diff)
parente8101a4d033a59237d542f4bd0ae0b5323058e26 (diff)
downloadmariadb-git-7434eb566e2cb832d7798196d50629dcaa1d7f79.tar.gz
Merge 10.3 into 10.4
Diffstat (limited to 'config.h.cmake')
-rw-r--r--config.h.cmake7
1 files changed, 2 insertions, 5 deletions
diff --git a/config.h.cmake b/config.h.cmake
index e7754337b1f..da2fc539bab 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -258,9 +258,6 @@
#cmakedefine STRUCT_TIMESPEC_HAS_TV_SEC 1
#cmakedefine STRUCT_TIMESPEC_HAS_TV_NSEC 1
-#define USE_MB 1
-#define USE_MB_IDENT 1
-
/* this means that valgrind headers and macros are available */
#cmakedefine HAVE_VALGRIND_MEMCHECK_H 1
@@ -459,8 +456,8 @@
#cmakedefine MYSQL_DEFAULT_CHARSET_NAME "@MYSQL_DEFAULT_CHARSET_NAME@"
#cmakedefine MYSQL_DEFAULT_COLLATION_NAME "@MYSQL_DEFAULT_COLLATION_NAME@"
-#cmakedefine USE_MB 1
-#cmakedefine USE_MB_IDENT 1
+#cmakedefine USE_MB
+#cmakedefine USE_MB_IDENT
/* This should mean case insensitive file system */
#cmakedefine FN_NO_CASE_SENSE 1