From: Tor Didriksen
Date: December 22 2010 9:23am
Subject: bzr commit into mysql-5.5-bugteam branch (tor.didriksen:3226) Bug#58991
List-Archive: http://lists.mysql.com/commits/127486
X-Bug: 58991
Message-Id: <20101222092314.89BAD3744@atum07.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0782937853004350195=="

--===============0782937853004350195==
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:anitha.gopi@stripped

 3226 Tor Didriksen	2010-12-22
      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	2010-12-22 09:23:08 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 Sun Microsystems, Inc
+# Copyright (c) 2010, 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	2010-12-22 09:23:08 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2009 Sun Microsystems, Inc
+/* Copyright (c) 2010, 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


--===============0782937853004350195==
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\
#   ugt4nzqqwaileshn
# target_branch: file:///export/home/didrik/repo/5.5-bugteam-\
#   bug58991charsetcmake/
# testament_sha1: 1f93cdf9f296f921fa5ec7b80173196e35935d14
# timestamp: 2010-12-22 10:23:13 +0100
# base_revision_id: anitha.gopi@stripped\
#   ypa7vfjrv2boj07p
# 
# Begin bundle
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
N/i7kinChISSZuOg


--===============0782937853004350195==--