bk commit into 4.1 tree (kent:1.2473) BUG#14918

[kent]

Below is the list of changes that have just been committed into a local
4.1 repository of kent. When kent does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2473 06/05/10 21:53:01 kent@stripped +1 -0
  mysql.spec.sh:
    Compile in all character sets in Max (bug#14918)

  support-files/mysql.spec.sh
    1.117 06/05/10 21:51:21 kent@stripped +8 -1
    Compile in all character sets in Max (bug#14918)

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	kent
# Host:	c-7b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
# Root:	/Users/kent/mysql/bk/mysql-4.1-new

--- 1.116/support-files/mysql.spec.sh	2006-05-01 19:46:52 +02:00
+++ 1.117/support-files/mysql.spec.sh	2006-05-10 21:51:21 +02:00
@@ -239,7 +239,6 @@
             --with-mysqld-user=%{mysqld_user} \
             --with-unix-socket-path=/var/lib/mysql/mysql.sock \
             --prefix=/ \
-	    --with-extra-charsets=complex \
             --exec-prefix=%{_exec_prefix} \
             --libexecdir=%{_sbindir} \
             --libdir=%{_libdir} \
@@ -297,6 +296,7 @@
 fi
 
 BuildMySQL "--enable-shared \
+		--with-extra-charsets=all \
 		--with-berkeley-db \
 		--with-innodb \
 		--with-ndbcluster \
@@ -361,6 +361,7 @@
 %else
 		--with-zlib-dir=bundled \
 %endif
+		--with-extra-charsets=complex \
 		--with-comment=\"MySQL Community Edition - Standard (GPL)\" \
 		--with-server-suffix='%{server_suffix}' \
 		--without-embedded-server \
@@ -708,6 +709,12 @@
 # itself - note that they must be ordered by date (important when
 # merging BK trees)
 %changelog 
+* Wed May 10 2006 Kent Boortz <kent@stripped>
+
+- Use character set "all" for the "max", to make Cluster nodes
+  independent on the character set directory, and the problem that
+  two RPM sub packages both wants to install this directory.
+
 * Mon May 01 2006 Kent Boortz <kent@stripped>
 
 - Use "./libtool --mode=execute" instead of searching for the