From: Tor Didriksen
Date: January 10 2011 8:33am
Subject: bzr commit into mysql-5.5 branch (tor.didriksen:3226) Bug#58991
List-Archive: http://lists.mysql.com/commits/128250
X-Bug: 58991
Message-Id: <20110110083348.BFAC23127@atum07.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0472357450273714433=="

--===============0472357450273714433==
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:vasil.dimov@stripped

 3226 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	2010-12-27 17:24:05 +0000
+++ b/config.h.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
@@ -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


--===============0472357450273714433==
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\
#   420f0k1kly60kd6t
# target_branch: file:///export/home/didrik/repo/5.5-\
#   bug58991charsetcmake/
# testament_sha1: 5069b75070fd33eeb9d08757d3a03e5a454a96cd
# timestamp: 2011-01-10 09:33:48 +0100
# source_branch: file:///export/home/didrik/repo/5.5-bugteam-\
#   bug58991charsetcmake/
# base_revision_id: vasil.dimov@stripped\
#   gpanhz48z8069qot
# 
# Begin bundle
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


--===============0472357450273714433==--