Commit 189b8bc5 authored by unknown's avatar unknown
Browse files

Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint 

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


configure.in:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/handler.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
parents 6fb4287a 04d2b020

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

configure.in

+0 −7
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ sinclude(config/ac-macros/check_cpu.m4) 
sinclude(config/ac-macros/character_sets.m4)

sinclude(config/ac-macros/compiler_flag.m4)

sinclude(config/ac-macros/plugins.m4)

sinclude(config/ac-macros/ha_berkeley.m4)

sinclude(config/ac-macros/ha_ndbcluster.m4)

sinclude(config/ac-macros/large_file.m4)

sinclude(config/ac-macros/misc.m4)
@@ -2139,12 +2138,6 @@ MYSQL_CHECK_SSL 
# functions tested above

#--------------------------------------------------------------------



MYSQL_STORAGE_ENGINE(berkeley,  berkeley-db, [BerkeleyDB Storage Engine],

        [Transactional Tables using BerkeleyDB], [max,max-no-ndb])

MYSQL_PLUGIN_DIRECTORY(berkeley,[storage/bdb])

MYSQL_PLUGIN_STATIC(berkeley,   [[\$(bdb_libs_with_path)]])

MYSQL_PLUGIN_ACTIONS(berkeley,  [MYSQL_SETUP_BERKELEY_DB])



MYSQL_STORAGE_ENGINE(blackhole,,[Blackhole Storage Engine],

        [Basic Write-only Read-never tables], [max,max-no-ndb])

MYSQL_PLUGIN_DIRECTORY(blackhole, [storage/blackhole])