diff options
| author | Tor Didriksen <tor.didriksen@oracle.com> | 2011-01-04 11:23:45 +0100 |
|---|---|---|
| committer | Tor Didriksen <tor.didriksen@oracle.com> | 2011-01-04 11:23:45 +0100 |
| commit | 7f3decd9b22827135af2aef7bfb711a960a86022 (patch) | |
| tree | f2dfe33070d21f32e7e4c0501a92c7958f97e441 /config.h.cmake | |
| parent | 498a5bbc82ed599fe36f0336f07655065a333a8e (diff) | |
| download | mariadb-git-7f3decd9b22827135af2aef7bfb711a960a86022.tar.gz | |
Bug #58991 DEFAULT_CHARSET and DEFAULT_COLLATION does not work with CMake.
cmake/character_sets.cmake:
Fix typo in variable name.
Some cosmetics.
config.h.cmake:
Do not use hard-coded defaults for charset and collation.
Diffstat (limited to 'config.h.cmake')
| -rw-r--r-- | config.h.cmake | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/config.h.cmake b/config.h.cmake index 204e1032410..65ebd077da6 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -1,6 +1,5 @@ -/* 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 |