mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Merge
This commit is contained in:
@ -246,7 +246,6 @@ sh -c "PATH=\"${MYSQL_BUILD_PATH:-$PATH}\" \
|
|||||||
--with-mysqld-user=%{mysqld_user} \
|
--with-mysqld-user=%{mysqld_user} \
|
||||||
--with-unix-socket-path=/var/lib/mysql/mysql.sock \
|
--with-unix-socket-path=/var/lib/mysql/mysql.sock \
|
||||||
--prefix=/ \
|
--prefix=/ \
|
||||||
--with-extra-charsets=complex \
|
|
||||||
%if %{YASSL_BUILD}
|
%if %{YASSL_BUILD}
|
||||||
--with-yassl \
|
--with-yassl \
|
||||||
%endif
|
%endif
|
||||||
@ -305,6 +304,7 @@ then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
BuildMySQL "--enable-shared \
|
BuildMySQL "--enable-shared \
|
||||||
|
--with-extra-charsets=all \
|
||||||
--with-berkeley-db \
|
--with-berkeley-db \
|
||||||
--with-innodb \
|
--with-innodb \
|
||||||
--with-ndbcluster \
|
--with-ndbcluster \
|
||||||
@ -367,6 +367,7 @@ BuildMySQL "--disable-shared \
|
|||||||
%else
|
%else
|
||||||
--with-zlib-dir=bundled \
|
--with-zlib-dir=bundled \
|
||||||
%endif
|
%endif
|
||||||
|
--with-extra-charsets=complex \
|
||||||
--with-comment=\"MySQL Community Edition - Standard (GPL)\" \
|
--with-comment=\"MySQL Community Edition - Standard (GPL)\" \
|
||||||
--with-server-suffix='%{server_suffix}' \
|
--with-server-suffix='%{server_suffix}' \
|
||||||
--with-archive-storage-engine \
|
--with-archive-storage-engine \
|
||||||
@ -720,6 +721,12 @@ fi
|
|||||||
# itself - note that they must be ordered by date (important when
|
# itself - note that they must be ordered by date (important when
|
||||||
# merging BK trees)
|
# 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>
|
* Mon May 01 2006 Kent Boortz <kent@mysql.com>
|
||||||
|
|
||||||
- Use "./libtool --mode=execute" instead of searching for the
|
- Use "./libtool --mode=execute" instead of searching for the
|
||||||
|
Reference in New Issue
Block a user