Merge mysql.com:/data0/mysqldev/my/tmp_merge

into  mysql.com:/data0/mysqldev/my/mysql-5.1-new

support-files/mysql.spec.sh

@@ -218,7 +218,7 @@ sh -c  "PATH=\"${MYSQL_BUILD_PATH:-$PATH}\" \
             --with-mysqld-user=%{mysqld_user} \
             --with-unix-socket-path=/var/lib/mysql/mysql.sock \
             --prefix=/ \
-	    --with-extra-charsets=complex \
+	    --with-extra-charsets=all \
 %if %{YASSL_BUILD}
 	    --with-yassl \
 %endif
@@ -683,6 +683,13 @@ fi
 # itself - note that they must be ordered by date (important when
 # merging BK trees)
 %changelog 
+ %changelog 
+* Wed May 10 2006 Kent Boortz <kent@mysql.com>
+
+- 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@mysql.com>
 
 - Use "./libtool --mode=execute" instead of searching for the