Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
73235971
Commit
73235971
authored
Jan 04, 2011
by
Tor Didriksen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bug #58991 DEFAULT_CHARSET and DEFAULT_COLLATION does not work with CMake.
parent
b627c681
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
11 deletions
+12
-11
cmake/character_sets.cmake
cmake/character_sets.cmake
+8
-6
config.h.cmake
config.h.cmake
+4
-5
No files found.
cmake/character_sets.cmake
View file @
73235971
# Copyright (
C) 2009 Sun Microsystems, Inc
# Copyright (
c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
#
# 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
...
...
@@ -13,17 +13,19 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#Charsets and collations
#
Charsets and collations
IF
(
NOT DEFAULT_CHARSET
)
SET
(
DEFAULT_CHARSET
"latin1"
)
SET
(
DEFAULT_CHARSET
"latin1"
)
ENDIF
()
IF
(
NOT DEFAULT_COLLATION
S
)
SET
(
DEFAULT_COLLATION
"latin1_swedish_ci"
)
IF
(
NOT DEFAULT_COLLATION
)
SET
(
DEFAULT_COLLATION
"latin1_swedish_ci"
)
ENDIF
()
SET
(
CHARSETS
${
DEFAULT_CHARSET
}
latin1 utf8 utf8mb4
)
SET
(
CHARSETS_COMPLEX big5 cp1250 cp932 eucjpms euckr gb2312 gbk latin1 latin2 sjis tis620 ucs2 ujis utf8 utf8mb4 utf16 utf32
)
SET
(
CHARSETS_COMPLEX
big5 cp1250 cp932 eucjpms euckr gb2312 gbk latin1 latin2
sjis tis620 ucs2 ujis utf8 utf8mb4 utf16 utf32
)
SET
(
CHARSETS_AVAILABLE
binary armscii8 ascii big5 cp1250 cp1251 cp1256 cp1257
...
...
config.h.cmake
View file @
73235971
/*
Copyright
(
C
)
2009, 2011, Oracle and/or its affiliates. All rights
reserved
/*
Copyright
(
c
)
2009, 2011, Oracle and/or its affiliates. All rights reserved.
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
the Free Software Foundation; version 2 of the License.
...
...
@@ -516,8 +515,8 @@
#cmakedefine CYBOZU 1
/* Character sets and collations */
#cmakedefine MYSQL_DEFAULT_CHARSET_NAME "
latin1
"
#cmakedefine MYSQL_DEFAULT_COLLATION_NAME "
latin1_swedish_ci
"
#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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment