Commit 882b7707 authored by unknown's avatar unknown
Browse files

Merge zim.(none):/home/brian/mysql/dep-5.1 

into  zim.(none):/home/brian/mysql/remove-bdb-5.1


configure.in:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/backup.result:
  Auto merged
mysql-test/r/im_utils.result:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged
sql/field.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/t/federated_transactions.test:
  Merge
parents 7260fd70 c235176e

BUILD/Makefile.am

+0 −1
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ EXTRA_DIST = FINISH.sh \ 
			compile-pentium-debug-max \

			compile-pentium-debug-max-no-embedded \

			compile-pentium-debug-max-no-ndb \

			compile-pentium-debug-no-bdb \

			compile-pentium-debug-openssl \

			compile-pentium-debug-yassl \

			compile-pentium-gcov \

BUILD/compile-dist

+0 −1
Original line number Diff line number Diff line
@@ -52,7 +52,6 @@ fi 
  --with-csv-storage-engine \

  --with-example-storage-engine \

  --with-federated-storage-engine \

  --with-berkeley-db \

  --with-innodb \

  --with-ssl \

  --enable-thread-safe-client \

BUILD/compile-pentium-debug-no-bdb

deleted100755 → 0
+0 −9
Original line number Diff line number Diff line 
#! /bin/sh



path=`dirname $0`

. "$path/SETUP.sh"



extra_flags="$pentium_cflags $debug_cflags"

extra_configs="$pentium_configs $debug_configs --without-berkeley-db $static_link"



. "$path/FINISH.sh"

BUILD/compile-solaris-sparc-purify

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ gmake -k clean || true 
path=`dirname $0`

. "$path/autorun.sh"



CFLAGS="-g -Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wimplicit-int -Wparentheses -Wsign-compare -Wwrite-strings -Wunused  -DHAVE_purify -DEXTRA_DEBUG -O2" CXX=gcc CXXLD=g++ CXXFLAGS="-g -Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wparentheses -Wsign-compare -Wwrite-strings -Woverloaded-virtual -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor -felide-constructors -fno-exceptions -fno-rtti  -DHAVE_purify -DEXTRA_DEBUG -O2" ./configure --prefix=/usr/local/mysql --enable-assembler --with-extra-charsets=complex --enable-thread-safe-client --with-berkeley-db --with-embedded-server --with-innodb $EXTRA_CONFIG_FLAGS

CFLAGS="-g -Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wimplicit-int -Wparentheses -Wsign-compare -Wwrite-strings -Wunused  -DHAVE_purify -DEXTRA_DEBUG -O2" CXX=gcc CXXLD=g++ CXXFLAGS="-g -Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wparentheses -Wsign-compare -Wwrite-strings -Woverloaded-virtual -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor -felide-constructors -fno-exceptions -fno-rtti  -DHAVE_purify -DEXTRA_DEBUG -O2" ./configure --prefix=/usr/local/mysql --enable-assembler --with-extra-charsets=complex --enable-thread-safe-client --with-embedded-server --with-innodb $EXTRA_CONFIG_FLAGS



gmake -j 4

CMakeLists.txt

+0 −3
Original line number Diff line number Diff line
@@ -131,9 +131,6 @@ ADD_SUBDIRECTORY(client) 
IF(WITH_ARCHIVE_STORAGE_ENGINE)

  ADD_SUBDIRECTORY(storage/archive)

ENDIF(WITH_ARCHIVE_STORAGE_ENGINE)

IF(WITH_BERKELEY_STORAGE_ENGINE)

  ADD_SUBDIRECTORY(storage/bdb)

ENDIF(WITH_BERKELEY_STORAGE_ENGINE)

IF(WITH_BLACKHOLE_STORAGE_ENGINE)

  ADD_SUBDIRECTORY(storage/blackhole)

ENDIF(WITH_BLACKHOLE_STORAGE_ENGINE)