From: Tor Didriksen
Date: January 17 2011 1:03pm
Subject: bzr commit into mysql-5.5 branch (tor.didriksen:3259) Bug#58991
List-Archive: http://lists.mysql.com/commits/128963
X-Bug: 58991
Message-Id: <20110117130323.48F2B312B@atum07.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2582178164830183810=="

--===============2582178164830183810==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///export/home/didrik/repo/5.5-bug58991charsetcmake/ based on revid:alexander.barkov@stripped

 3259 Tor Didriksen	2011-01-04
      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.

    modified:
      cmake/character_sets.cmake
      config.h.cmake
=== modified file 'cmake/character_sets.cmake'
--- a/cmake/character_sets.cmake	2010-02-25 08:15:46 +0000
+++ b/cmake/character_sets.cmake	2011-01-04 10:23:45 +0000
@@ -1,4 +1,4 @@
-# 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_COLLATIONS)
-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

=== modified file 'config.h.cmake'
--- a/config.h.cmake	2011-01-11 09:07:37 +0000
+++ b/config.h.cmake	2011-01-04 10:23:45 +0000
@@ -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


--===============2582178164830183810==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/tor.didriksen@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: tor.didriksen@stripped\
#   gfgvzspwrndg65he
# target_branch: file:///export/home/didrik/repo/5.5-\
#   bug58991charsetcmake/
# testament_sha1: 2981b06343d4c5fe97da16a6febad5a0ea0c1bdb
# timestamp: 2011-01-17 14:03:23 +0100
# source_branch: file:///export/home/didrik/repo/5.5-bugteam-\
#   bug58991charsetcmake/
# base_revision_id: alexander.barkov@stripped\
#   tlwbdj268iau16rk
# 
# Begin bundle
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
UWBtSgozSpMjaa8qS/xdyRThQkEmODw8


--===============2582178164830183810==--