diff options
| author | unknown <jani@a88-113-38-195.elisa-laajakaista.fi> | 2007-01-22 03:33:59 +0200 |
|---|---|---|
| committer | unknown <jani@a88-113-38-195.elisa-laajakaista.fi> | 2007-01-22 03:33:59 +0200 |
| commit | 077840fa23d65e1eb60fdd601802b151ff4b54b4 (patch) | |
| tree | 2c5744d9e9cf04714fcd0fe9214cfb40b2656b74 /BUILD | |
| parent | 4fda992bff2034ff551d30cb5da742184ff4a3df (diff) | |
| parent | 454c763c6be44b34c8e1ff9b8561ab21e717b742 (diff) | |
| download | mariadb-git-077840fa23d65e1eb60fdd601802b151ff4b54b4.tar.gz | |
Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-4.0
into a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
include/thr_alarm.h:
Auto merged
mysys/my_pthread.c:
Auto merged
BUILD/SETUP.sh:
Merged from 4.0
configure.in:
Merged from 4.0
include/my_global.h:
Merged from 4.0
include/my_pthread.h:
Merged from 4.0
mysys/thr_alarm.c:
Merged from 4.0
sql/mysqld.cc:
Merged from 4.0
BUILD/SETUP.sh.rej:
Merged from 4.0
configure.in.rej:
Merged from 4.0
include/my_global.h.rej:
Merged from 4.0
include/my_pthread.h.rej:
Merged from 4.0
mysys/thr_alarm.c.rej:
Merged from 4.0
sql/mysqld.cc.rej:
Merged from 4.0
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 |