Import changeset

16 files changed, 188 insertions, 0 deletions

diff --git a/BUILD/.cvsignore b/BUILD/.cvsignore
new file mode 100644
index 00000000000..0114f18cab7
--- /dev/null
+++ b/BUILD/.cvsignore
@@ -0,0 +1 @@
+compile-pentium-test
diff --git a/BUILD/compile-alpha b/BUILD/compile-alpha
new file mode 100755
index 00000000000..ff70be8a5ab
--- /dev/null
+++ b/BUILD/compile-alpha
@@ -0,0 +1,7 @@
+make -k clean
+/bin/rm -f */.deps/*.P */*.o
+/bin/rm -f config.cache
+aclocal; autoheader; aclocal; automake; autoconf
+
+CFLAGS="-O6 -fomit-frame-pointer -mcpu=ev6 -Wa,-mev6" CXX=gcc CXXFLAGS="-O6 -mcpu=ev6 -Wa,-mev6 -fomit-frame-pointer -felide-constructors -fno-exceptions -fno-rtti" ./configure --prefix=/usr/local/mysql --disable-shared --with-extra-charsets=complex
+make
diff --git a/BUILD/compile-alpha-ccc b/BUILD/compile-alpha-ccc
new file mode 100755
index 00000000000..194ed099541
--- /dev/null
+++ b/BUILD/compile-alpha-ccc
@@ -0,0 +1,35 @@
+/bin/rm -f */.deps/*.P */*.o
+make -k clean
+/bin/rm -f */.deps/*.P */*.o
+/bin/rm -f config.cache mysql-*.tar.gz
+aclocal; autoheader; aclocal; automake; autoconf
+
+CC=ccc CFLAGS="-fast -O3 -fomit-frame-pointer" CXX=gcc CXXFLAGS="-O6 -fomit-frame-pointer -felide-constructors -fno-exceptions -fno-rtti -mcpu=ev6 -Wa,-mev6" CXXLDFLAGS='/usr/lib/compaq/libots-2.2.7/libots.so /usr/lib/compaq/cpml-5.0.0/libcpml_ev6.a' ./configure --prefix=/usr/local/mysql --disable-shared --with-extra-charsets=complex
+make
+if [ $? = 0 ]
+then
+  rm */.deps/*
+  bin/mysqladmin shutdown
+  make install
+  if [ $? = 0 ]
+  then
+     scripts/make_binary_distribution
+  fi
+fi
+
+exit
+
+# This should give better performance by compiling many files at once, but
+# according to our benchmarks there isn't any real difference.
+
+pwd=`pwd`
+for i in */make-ccc
+do
+   cd `dirname $i`
+   make-ccc
+   cd $pwd
+done
+cd sql
+rm mysqld .deps/*.P
+make mysqld
+cd $pwd
diff --git a/BUILD/compile-alpha-debug b/BUILD/compile-alpha-debug
new file mode 100755
index 00000000000..6672027445e
--- /dev/null
+++ b/BUILD/compile-alpha-debug
@@ -0,0 +1,7 @@
+make -k clean
+/bin/rm -f */.deps/*.P
+/bin/rm -f config.cache
+aclocal; autoheader; aclocal; automake; autoconf
+
+CFLAGS=-O6 CXX=gcc CXXFLAGS="-O6 -felide-constructors -fno-exceptions -fno-rtti" ./configure --prefix=/usr/local/mysql --with-debug
+make
diff --git a/BUILD/compile-ia64-O0 b/BUILD/compile-ia64-O0
new file mode 100644
index 00000000000..d07067289b4
--- /dev/null
+++ b/BUILD/compile-ia64-O0
@@ -0,0 +1,12 @@
+make -k clean
+/bin/rm -f */.deps/*.P config.cache
+
+aclocal; autoheader; aclocal; automake; autoconf
+
+CFLAGS="-O0 -fomit-frame-pointer" CXX=gcc CXXFLAGS="-O0 -fomit-frame-pointer -felide-constructors -fno-exceptions -fno-rtti" ./configure --prefix=/usr/local/mysql --enable-assembler --with-mysqld-ldflags=-all-static --disable-shared --with-extra-charsets=complex
+make
+strip sql/mysqld
+
+
+
+
diff --git a/BUILD/compile-ia64-O0-sgicc b/BUILD/compile-ia64-O0-sgicc
new file mode 100644
index 00000000000..c5e14eab033
--- /dev/null
+++ b/BUILD/compile-ia64-O0-sgicc
@@ -0,0 +1,12 @@
+make -k clean
+/bin/rm -f */.deps/*.P config.cache
+
+aclocal; autoheader; aclocal; automake; autoconf
+
+CC=sgicc CFLAGS="-O0" CXX=sgicc CXXFLAGS="-O0" ./configure --prefix=/usr/local/mysql --enable-assembler --with-mysqld-ldflags=-all-static --disable-shared --with-extra-charsets=complex
+make
+strip sql/mysqld
+
+
+
+
diff --git a/BUILD/compile-ia64-O2 b/BUILD/compile-ia64-O2
new file mode 100644
index 00000000000..140d34b2466
--- /dev/null
+++ b/BUILD/compile-ia64-O2
@@ -0,0 +1,12 @@
+make -k clean
+/bin/rm -f */.deps/*.P config.cache
+
+aclocal; autoheader; aclocal; automake; autoconf
+
+CFLAGS="-O2 -fomit-frame-pointer" CXX=gcc CXXFLAGS="-O2 -fomit-frame-pointer -felide-constructors -fno-exceptions -fno-rtti" ./configure --prefix=/usr/local/mysql --enable-assembler --with-mysqld-ldflags=-all-static --disable-shared --with-extra-charsets=complex
+make
+strip sql/mysqld
+
+
+
+
diff --git a/BUILD/compile-ia64-O2-sgicc b/BUILD/compile-ia64-O2-sgicc
new file mode 100644
index 00000000000..64b2ff17beb
--- /dev/null
+++ b/BUILD/compile-ia64-O2-sgicc
@@ -0,0 +1,12 @@
+make -k clean
+/bin/rm -f */.deps/*.P config.cache
+
+aclocal; autoheader; aclocal; automake; autoconf
+
+CC=sgicc CFLAGS="-O2" CXX=sgicc CXXFLAGS="-O2" ./configure --prefix=/usr/local/mysql --enable-assembler --with-mysqld-ldflags=-all-static --disable-shared --with-extra-charsets=complex
+make
+strip sql/mysqld
+
+
+
+
diff --git a/BUILD/compile-ia64-O6 b/BUILD/compile-ia64-O6
new file mode 100644
index 00000000000..8792c0e1479
--- /dev/null
+++ b/BUILD/compile-ia64-O6
@@ -0,0 +1,8 @@
+make -k clean
+/bin/rm -f */.deps/*.P config.cache
+
+aclocal; autoheader; aclocal; automake; autoconf
+
+CFLAGS="-O6 -fomit-frame-pointer" CXX=gcc CXXFLAGS="-O6 -fomit-frame-pointer -felide-constructors -fno-exceptions -fno-rtti" ./configure --prefix=/usr/local/mysql --enable-assembler --with-mysqld-ldflags=-all-static --disable-shared --with-extra-charsets=complex
+make
+strip sql/mysqld
diff --git a/BUILD/compile-pentium b/BUILD/compile-pentium
new file mode 100755
index 00000000000..29697ffdc88
--- /dev/null
+++ b/BUILD/compile-pentium
@@ -0,0 +1,8 @@
+make -k clean
+/bin/rm -f */.deps/*.P config.cache
+
+aclocal; autoheader; aclocal; automake; autoconf
+
+CFLAGS="-O6 -mpentiumpro -fomit-frame-pointer" CXX=gcc CXXFLAGS="-O6 -mpentiumpro -fomit-frame-pointer -felide-constructors -fno-exceptions -fno-rtti" ./configure --prefix=/usr/local/mysql --enable-assembler --with-mysqld-ldflags=-all-static --disable-shared --with-extra-charsets=complex
+make
+strip sql/mysqld
diff --git a/BUILD/compile-pentium-debug b/BUILD/compile-pentium-debug
new file mode 100755
index 00000000000..a8c2c98e0ef
--- /dev/null
+++ b/BUILD/compile-pentium-debug
@@ -0,0 +1,19 @@
+make -k clean
+/bin/rm -f */.deps/*.P config.cache
+
+aclocal; autoheader; aclocal; automake; autoconf
+
+# If you are not using codefusion add "-Wpointer-arith" to WARNINGS
+# The following warning flag will give too many warnings:
+# -Wshadow -Wunused  -Winline (The later isn't usable in C++ as
+# __attribute()__ doesn't work with gnu C++)
+
+GLOBAL_WARNINGS="-Wimplicit -Wreturn-type -Wid-clash-51 -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wuninitialized -Wformat -Wimplicit-function-dec -Wimplicit-int -Wparentheses -Wsign-compare -Wwrite-strings"
+C_WARNINGS="$GLOBAL_WARNINGS -Wunused"
+CC_WARNINGS="$GLOBAL_WARNINGS -Woverloaded-virtual -Wextern-inline -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor"
+
+CFLAGS="-DFORCE_INIT_OF_VARS  -O2 -mpentiumpro $C_WARNINGS" CXX=gcc \
+CXXFLAGS="-DFORCE_INIT_OF_VARS -O2 -mpentiumpro -felide-constructors -fno-exceptions -fno-rtti $CC_WARNINGS" \
+./configure --prefix=/usr/local/mysql --enable-assembler --with-mysqld-ldflags=-all-static --disable-shared --with-extra-charsets=complex --with-debug=full
+--with-berkeley-db=/usr/local/BerkeleyDB
+make
diff --git a/BUILD/compile-pentium-gcov b/BUILD/compile-pentium-gcov
new file mode 100755
index 00000000000..e28d211d6d2
--- /dev/null
+++ b/BUILD/compile-pentium-gcov
@@ -0,0 +1,16 @@
+make -k clean
+/bin/rm -f */.deps/*.P config.cache
+
+aclocal; autoheader; aclocal; automake; autoconf
+
+# If you are not using codefusion add "-Wpointer-arith" to WARNINGS
+# The following warning flag will give too many warnings:
+# -Wshadow -Wunused  (The later isn't usable in C++ as
+# __attribute()__ doesn't work with gnu C++)
+
+GLOBAL_WARNINGS="-Wimplicit -Wreturn-type -Wid-clash-51 -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts  -Wuninitialized -Wformat -Wimplicit-function-dec -Wimplicit-int -Wparentheses -Wsign-compare -Wwrite-strings"
+C_WARNINGS="$GLOBAL_WARNINGS -Wunused"
+CC_WARNINGS="$GLOBAL_WARNINGS -Woverloaded-virtual -Wextern-inline -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor"
+
+CFLAGS="-O2 -mpentiumpro -fprofile-arcs -ftest-coverage $C_WARNINGS" CXX=gcc CXXFLAGS="-O2 -mpentiumpro -fprofile-arcs -ftest-coverage -felide-constructors -fno-exceptions -fno-rtti $CC_WARNINGS" ./configure --prefix=/usr/local/mysql --enable-assembler --with-mysqld-ldflags=-all-static --disable-shared --with-extra-charsets=complex --with-debug=full
+make
diff --git a/BUILD/compile-pentium-myodbc b/BUILD/compile-pentium-myodbc
new file mode 100755
index 00000000000..989f98eac60
--- /dev/null
+++ b/BUILD/compile-pentium-myodbc
@@ -0,0 +1,6 @@
+make -k clean
+/bin/rm -f */.deps/*.P config.cache
+
+aclocal; autoheader; aclocal; automake; autoconf
+
+CFLAGS="-O6 -mpentiumpro -fomit-frame-pointer" CXX=gcc CXXFLAGS="-O6 -mpentiumpro -fomit-frame-pointer -felide-constructors -fno-exceptions -fno-rtti" ./configure --prefix=/usr/local/mysql --enable-assembler --with-mysqld-ldflags=-all-static --with-extra-charsets=complex --without-server
diff --git a/BUILD/compile-solaris-sparc b/BUILD/compile-solaris-sparc
new file mode 100755
index 00000000000..0cfa8a4ecd0
--- /dev/null
+++ b/BUILD/compile-solaris-sparc
@@ -0,0 +1,9 @@
+gmake -k clean
+/bin/rm -f */.deps/*.P */*.o
+/bin/rm -f config.cache
+aclocal; autoheader; aclocal; automake; autoconf
+
+CFLAGS="-O6 -fomit-frame-pointer" CXX=gcc CXXFLAGS="-O6 -fomit-frame-pointer -f
+elide-constructors -fno-exceptions -fno-rtti" ./configure --prefix=/usr/local/m
+ysql --with-extra-charsets=complex
+gmake
diff --git a/BUILD/compile-solaris-sparc-purify b/BUILD/compile-solaris-sparc-purify
new file mode 100755
index 00000000000..2a48d71375d
--- /dev/null
+++ b/BUILD/compile-solaris-sparc-purify
@@ -0,0 +1,13 @@
+gmake -k clean
+/bin/rm -f */.deps/*.P */*.o
+/bin/rm -f config.cache
+aclocal; autoheader; aclocal; automake; autoconf
+
+GLOBAL_WARNINGS="-Wimplicit -Wreturn-type -Wid-clash-51 -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wuninitialized -Wformat -Wimplicit-function-dec -Wimplicit-int -Wparentheses -Wsign-compare -Wwrite-strings"
+C_WARNINGS="$GLOBAL_WARNINGS -Wunused"
+CC_WARNINGS="$GLOBAL_WARNINGS -Woverloaded-virtual -Wextern-inline -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor"
+
+CFLAGS="-DHAVE_PURIFY -O2 $C_WARNINGS" CXX=gcc \
+CXXFLAGS="-DHAVE_PURIFY -O2 -felide-constructors -fno-exceptions -fno-rtti $CC_WARNINGS" \
+./configure --prefix=/usr/local/mysql --enable-assembler --with-mysqld-ldflags=-all-static --disable-shared  --with-debug=full
+gmake
diff --git a/BUILD/test-alpha-ccc b/BUILD/test-alpha-ccc
new file mode 100755
index 00000000000..c6f4abc0973
--- /dev/null
+++ b/BUILD/test-alpha-ccc
@@ -0,0 +1,11 @@
+cd /usr/local/mysql
+bin/mysqladmin shutdown
+libexec/mysqld --basedir . &
+cd sql-bench
+rm output/*
+perl run-all-tests --comment "Alpha DS20 2x500 MHz, 2G memory, key_buffer=16M; egcs 1.1.2 + ccc" --user=monty --password="ds20-gryta"
+perl run-all-tests --comment "Alpha DS20 2x500 MHz, 2G memory, key_buffer=16M; egcs 1.1.2 + ccc" --user=monty --password="ds20-gryta" --log --use-old
+mv output/* output-ccc
+perl run-all-tests --comment "Alpha DS20 2x500 MHz, 2G memory, key_buffer=16M; egcs 1.1.2 + ccc" --user=monty --password="ds20-gryta" --fast
+perl run-all-tests --comment "Alpha DS20 2x500 MHz, 2G memory, key_buffer=16M; egcs 1.1.2 + ccc" --user=monty --password="ds20-gryta" --log --use-old --fast
+mv output/* output-ccc