diff options
| author | tomas@poseidon.ndb.mysql.com <> | 2006-05-16 11:05:50 +0200 |
|---|---|---|
| committer | tomas@poseidon.ndb.mysql.com <> | 2006-05-16 11:05:50 +0200 |
| commit | 9e883ac3d724c8d38141cc49c3fcea1c41ece34a (patch) | |
| tree | d6dcfef225bec24bb4e55e7b2f55fa0475d5e0fd /support-files | |
| parent | fddbcb2bf8333d072c969c0662aff799847bf369 (diff) | |
| parent | ca4b18fb15468ee8082417a71b2d53ef97300893 (diff) | |
| download | mariadb-git-9e883ac3d724c8d38141cc49c3fcea1c41ece34a.tar.gz | |
Merge jonas@perch:src/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/mysql.spec.sh | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index 494daa68283..f3cf642e4da 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -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 \ @@ -721,6 +722,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 |