Commit 0720c110 authored by unknown's avatar unknown
Browse files

Merge

parents 8db63fd5 bc1815aa
Loading
Loading
Loading
Loading
+8 −1
Original line number Diff line number Diff line
@@ -246,7 +246,6 @@ 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 \
%if %{YASSL_BUILD}
	    --with-yassl \
%endif
@@ -305,6 +304,7 @@ then
fi

BuildMySQL "--enable-shared \
		--with-extra-charsets=all \
		--with-berkeley-db \
		--with-innodb \
		--with-ndbcluster \
@@ -367,6 +367,7 @@ BuildMySQL "--disable-shared \
%else
		--with-zlib-dir=bundled \
%endif
		--with-extra-charsets=complex \
		--with-comment=\"MySQL Community Edition - Standard (GPL)\" \
		--with-server-suffix='%{server_suffix}' \
		--with-archive-storage-engine \
@@ -720,6 +721,12 @@ fi
# itself - note that they must be ordered by date (important when
# merging BK trees)
%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