diff options
author | unknown <kent@mysql.com/kent-amd64.(none)> | 2007-04-05 08:30:49 +0200 |
---|---|---|
committer | unknown <kent@mysql.com/kent-amd64.(none)> | 2007-04-05 08:30:49 +0200 |
commit | bbc6ed24e0671d4d18751f171d258e70185db2a8 (patch) | |
tree | 3ce6a38939445b84347b0cfdadeaeee19d9ea54f /BUILD | |
parent | 5e00af7ec789cd20bda6a517d420d3cc14fa8f57 (diff) | |
parent | f76ab0c46937a0d53ee0907c2a17daca6106c52a (diff) | |
download | mariadb-git-bbc6ed24e0671d4d18751f171d258e70185db2a8.tar.gz |
Merge mysql.com:/home/kent/bk/sotest/mysql-4.1-build
into mysql.com:/home/kent/bk/sotest/mysql-5.0-build
Diffstat (limited to 'BUILD')
-rw-r--r-- | BUILD/SETUP.sh.rej | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/BUILD/SETUP.sh.rej b/BUILD/SETUP.sh.rej deleted file mode 100644 index ccbcaa4404f..00000000000 --- a/BUILD/SETUP.sh.rej +++ /dev/null @@ -1,19 +0,0 @@ -*************** -*** 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 |