diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-05-16 18:20:49 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-05-16 18:20:49 +0300 |
| commit | 4d094257dbb785d792785e610ab3cdf41eae9b8c (patch) | |
| tree | 12de711f3f9d8ad9eee9d28cf71e5487f17315d3 /Build-tools | |
| parent | 2618c6963c5bf1349c47ce3af6e55213ea9773f4 (diff) | |
| parent | 74d29a07712a0caf57fca62dacfeb14b110beca4 (diff) | |
| download | mariadb-git-4d094257dbb785d792785e610ab3cdf41eae9b8c.tar.gz | |
merge with 3.23.51
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
BitKeeper/deleted/.del-mysql_fix_extensions.sh:
Delete: scripts/mysql_fix_extensions.sh
Build-tools/Do-rpm:
Auto merged
Makefile.am:
Auto merged
client/mysqldump.c:
Auto merged
client/mysqltest.c:
Auto merged
extra/resolve_stack_dump.c:
Auto merged
include/my_pthread.h:
Auto merged
include/my_sys.h:
Auto merged
include/mysqld_error.h:
Auto merged
innobase/row/row0ins.c:
Auto merged
innobase/row/row0mysql.c:
Auto merged
innobase/row/row0sel.c:
Auto merged
isam/pack_isam.c:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/r/func_if.result:
Auto merged
mysql-test/t/join.test:
Auto merged
mysys/array.c:
Auto merged
mysys/charset.c:
Auto merged
mysys/default.c:
Auto merged
mysys/hash.c:
Auto merged
mysys/my_thr_init.c:
Auto merged
mysys/raid.cc:
Auto merged
mysql-test/t/type_decimal.test:
Auto merged
sql/hostname.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/item_timefunc.h:
Auto merged
sql/log.cc:
Auto merged
sql/mini_client.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
strings/Makefile.am:
Auto merged
Diffstat (limited to 'Build-tools')
| -rwxr-xr-x | Build-tools/Do-rpm | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/Build-tools/Do-rpm b/Build-tools/Do-rpm index 410338b9ce6..6d107bc2413 100755 --- a/Build-tools/Do-rpm +++ b/Build-tools/Do-rpm @@ -159,10 +159,14 @@ cat > $logdir/$TMP_SCRIPT_MYSQL <<END set -x # Check environment -export MYSQL_BUILD_PATH="/usr/local/bin:/my/gnu/bin:/usr/bin:/bin" -export MYSQL_BUILD_CFLAGS="-O6 -fno-omit-frame-pointer -mcpu=pentiumpro" +#export MYSQL_BUILD_PATH="/usr/local/bin:/my/gnu/bin:/usr/bin:/bin" +#export MYSQL_BUILD_CFLAGS="-O6 -fno-omit-frame-pointer -mcpu=pentiumpro" +#export MYSQL_BUILD_CXXFLAGS="-O6 -fno-omit-frame-pointer \ +# -felide-constructors -fno-exceptions -fno-rtti -mcpu=pentiumpro" +export MYSQL_BUILD_PATH="/usr/bin:/bin" +export MYSQL_BUILD_CFLAGS="-O6 -fno-omit-frame-pointer -mpentium" export MYSQL_BUILD_CXXFLAGS="-O6 -fno-omit-frame-pointer \ - -felide-constructors -fno-exceptions -fno-rtti -mcpu=pentiumpro" + -felide-constructors -fno-exceptions -fno-rtti -mpentium" gcc -v # Make RPM |