Merged with 3.23, needs further fix-up

BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
acconfig.h:
  Auto merged
acinclude.m4:
  Auto merged
include/myisam.h:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
BitKeeper/deleted/.del-ib_config.h.in~9e57db8504e55b7:
  Auto merged
BitKeeper/deleted/.del-ib_config.h~7539e26ffc614439:
  Auto merged
client/mysqltest.c:
  Auto merged
sql/lex.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/table.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_class.h:
  Auto merged
Docs/manual.texi:
  merged
client/errmsg.c:
  merged
configure.in:
  merged
sql/mysqld.cc:
  merged
sql/sql_select.cc:
  merged, needs manual fixing
sql/sql_yacc.yy:
  merged, needs manual fixing

5 files changed, 0 insertions, 56 deletions

diff --git a/BUILD/compile-ia64-O0 b/BUILD/compile-ia64-O0
deleted file mode 100644
index d07067289b4..00000000000
--- a/BUILD/compile-ia64-O0
+++ /dev/null
@@ -1,12 +0,0 @@
-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
deleted file mode 100644
index c5e14eab033..00000000000
--- a/BUILD/compile-ia64-O0-sgicc
+++ /dev/null
@@ -1,12 +0,0 @@
-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
deleted file mode 100644
index 140d34b2466..00000000000
--- a/BUILD/compile-ia64-O2
+++ /dev/null
@@ -1,12 +0,0 @@
-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
deleted file mode 100644
index 64b2ff17beb..00000000000
--- a/BUILD/compile-ia64-O2-sgicc
+++ /dev/null
@@ -1,12 +0,0 @@
-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
deleted file mode 100644
index 8792c0e1479..00000000000
--- a/BUILD/compile-ia64-O6
+++ /dev/null
@@ -1,8 +0,0 @@
-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