diff options
| author | unknown <istruewing@chilla.local> | 2007-01-29 18:47:46 +0100 |
|---|---|---|
| committer | unknown <istruewing@chilla.local> | 2007-01-29 18:47:46 +0100 |
| commit | 1042a25a7fe0ecb94af989524796b4619ba31751 (patch) | |
| tree | d5baa9f433ccab67349d65f3e71a37dfb9ef45b2 /BUILD | |
| parent | 92a7c1ed9c6dec1fee17a830fdabe9272d6692bd (diff) | |
| parent | d308799383bdbcaad568c9844b34708462dd74e7 (diff) | |
| download | mariadb-git-1042a25a7fe0ecb94af989524796b4619ba31751.tar.gz | |
Merge chilla.local:/home/mydev/mysql-4.1-axmrg
into chilla.local:/home/mydev/mysql-5.0-axmrg
BUILD/SETUP.sh:
Auto merged
configure.in:
Auto merged
include/my_global.h:
Auto merged
include/thr_alarm.h:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/symlink.result:
Auto merged
mysql-test/t/myisam.test:
Auto merged
mysql-test/t/symlink.test:
Auto merged
mysys/my_pthread.c:
Auto merged
sql/item_func.cc:
Auto merged
include/my_pthread.h:
Manual merged
mysql-test/r/myisam.result:
Manual merged
mysys/thr_alarm.c:
Manual merged
sql/ha_ndbcluster.cc:
Manual merged
sql/mysqld.cc:
Manual merged
Diffstat (limited to 'BUILD')
| -rw-r--r-- | BUILD/SETUP.sh.rej | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/BUILD/SETUP.sh.rej b/BUILD/SETUP.sh.rej new file mode 100644 index 00000000000..ccbcaa4404f --- /dev/null +++ b/BUILD/SETUP.sh.rej @@ -0,0 +1,19 @@ +*************** +*** 39,46 **** + c_warnings="$global_warnings -Wunused" + cxx_warnings="$global_warnings -Woverloaded-virtual -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor" + +! alpha_cflags="-mcpu=ev6 -Wa,-mev6" # Not used yet +! pentium_cflags="-mcpu=pentiumpro" + sparc_cflags="" + + # be as fast as we can be without losing our ability to backtrace +--- 39,46 ---- + c_warnings="$global_warnings -Wunused" + cxx_warnings="$global_warnings -Woverloaded-virtual -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor" + +! #alpha_cflags="-mcpu=ev6 -Wa,-mev6" # Not used yet +! #pentium_cflags="-mcpu=pentiumpro" + sparc_cflags="" + + # be as fast as we can be without losing our ability to backtrace |