From: Tor Didriksen
Date: January 6 2011 10:14am
Subject: bzr commit into mysql-5.5-bugteam branch (tor.didriksen:3229) Bug#58991
List-Archive: http://lists.mysql.com/commits/128055
X-Bug: 58991
Message-Id: <20110106101428.28573377A@atum07.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3258012247382312160=="

--===============3258012247382312160==
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-bugteam-bug58991charsetcmake/ based on revid:dao-gang.qu@stripped

 3229 Tor Didriksen	2011-01-06
      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-06 10:14:25 +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	2010-12-21 12:00:26 +0000
+++ b/config.h.cmake	2011-01-06 10:14:25 +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
@@ -518,8 +518,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


--===============3258012247382312160==
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\
#   2t70uej3szc9c0n5
# target_branch: file:///export/home/didrik/repo/5.5-bugteam-\
#   bug58991charsetcmake/
# testament_sha1: cb56dcb2b5c74e586f5d9506eadae3f4a59823ee
# timestamp: 2011-01-06 11:14:27 +0100
# base_revision_id: dao-gang.qu@stripped\
#   ohzfrfknpqtvhmcw
# 
# Begin bundle
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


--===============3258012247382312160==--