Commit 61049dcb authored by lenz@mysql.com's avatar lenz@mysql.com

Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1

into mysql.com:/space/my/mysql-4.1
parents e2e94c9e 9efeb566
...@@ -276,7 +276,6 @@ sh -c "PATH=\"${MYSQL_BUILD_PATH:-$PATH}\" \ ...@@ -276,7 +276,6 @@ sh -c "PATH=\"${MYSQL_BUILD_PATH:-$PATH}\" \
--includedir=%{_includedir} \ --includedir=%{_includedir} \
--mandir=%{_mandir} \ --mandir=%{_mandir} \
--enable-thread-safe-client \ --enable-thread-safe-client \
--with-comment=\"Official MySQL RPM\" \
--with-readline ; --with-readline ;
# Add this for more debugging support # Add this for more debugging support
# --with-debug # --with-debug
...@@ -333,6 +332,7 @@ BuildMySQL "--enable-shared \ ...@@ -333,6 +332,7 @@ BuildMySQL "--enable-shared \
--with-csv-storage-engine \ --with-csv-storage-engine \
--with-example-storage-engine \ --with-example-storage-engine \
--with-embedded-server \ --with-embedded-server \
--with-comment=\"MySQL Community Edition - Max (GPL)\" \
--with-server-suffix='-Max'" --with-server-suffix='-Max'"
# Save everything for debug # Save everything for debug
...@@ -379,6 +379,7 @@ BuildMySQL "--disable-shared \ ...@@ -379,6 +379,7 @@ BuildMySQL "--disable-shared \
--with-client-ldflags='-all-static' \ --with-client-ldflags='-all-static' \
$USE_OTHER_LIBC_DIR \ $USE_OTHER_LIBC_DIR \
%endif %endif
--with-comment=\"MySQL Community Edition - Standard (GPL)\" \
--with-server-suffix='%{server_suffix}' \ --with-server-suffix='%{server_suffix}' \
--without-embedded-server \ --without-embedded-server \
--without-berkeley-db \ --without-berkeley-db \
...@@ -694,7 +695,12 @@ fi ...@@ -694,7 +695,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
* Monday Feb 7 2005 Tomas Ulin <tomas@mysql.com> * Mon Feb 14 2005 Tomas Ulin <tomas@mysql.com>
* Fixed the compilation comments and moved them into the separate build sections
for Max and Standard
* Mon Feb 7 2005 Tomas Ulin <tomas@mysql.com>
- enabled the "Ndbcluster" storage engine for the max binary - enabled the "Ndbcluster" storage engine for the max binary
- added extra make install in ndb subdir after Max build to get ndb binaries - added extra make install in ndb subdir after Max build to get ndb binaries
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment