From: Tor Didriksen
Date: January 4 2011 10:23am
Subject: bzr commit into mysql-5.5 branch (tor.didriksen:3213) Bug#58991
List-Archive: http://lists.mysql.com/commits/127870
X-Bug: 58991
Message-Id: <20110104102349.AEE503776@atum07.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2450208797169586814=="

--===============2450208797169586814==
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:mikael@dator8-20110103145904-7b8j3z5pmu6t4jj9

 3213 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-21 12:00:26 +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


--===============2450208797169586814==
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\
#   oktclpbjdllxhy74
# target_branch: file:///export/home/didrik/repo/5.5-\
#   bug58991charsetcmake/
# testament_sha1: b1d1989ebb15250a6524d0eaf9c2c7a8fbb443af
# timestamp: 2011-01-04 11:23:49 +0100
# source_branch: file:///export/home/didrik/repo/5.5-bugteam-\
#   bug58991charsetcmake/
# base_revision_id: mikael@dator8-20110103145904-7b8j3z5pmu6t4jj9
# 
# Begin bundle
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
7ChvJVTrY6XN/xdyRThQkPxqB64=


--===============2450208797169586814==--