diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-10-13 10:05:29 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-10-13 10:05:29 +0300 |
| commit | 588efca2374536aab956e6366f96082f2886c73c (patch) | |
| tree | af1b126c795cd1255d7c7d72c201c01339119755 /config.h.cmake | |
| parent | b6ebadaa66ee68b1880c0e10669543d1ba058c18 (diff) | |
| parent | 1feccb505f9ec5cada8f8e2c544f736c1a533633 (diff) | |
| download | mariadb-git-588efca2374536aab956e6366f96082f2886c73c.tar.gz | |
Merge 10.6 into 10.7
Diffstat (limited to 'config.h.cmake')
| -rw-r--r-- | config.h.cmake | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/config.h.cmake b/config.h.cmake index f5a0d7e2396..e8712d16ba6 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -222,7 +222,6 @@ #cmakedefine HAVE_SIGWAIT 1 #cmakedefine HAVE_SIGWAITINFO 1 #cmakedefine HAVE_SLEEP 1 -#cmakedefine HAVE_SNPRINTF 1 #cmakedefine HAVE_STPCPY 1 #cmakedefine HAVE_STRERROR 1 #cmakedefine HAVE_STRCOLL 1 @@ -257,9 +256,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 @@ -455,8 +451,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 |