Commit 04d2b020 authored by unknown's avatar unknown
Browse files

This is the second patch for bdb removeal. This takes care of all options and... 

This is the second patch for bdb removeal. This takes care of all options and variables that rely on bdb. 


BitKeeper/deleted/.del-ha_berkeley.cc:
  Delete: sql/ha_berkeley.cc
BitKeeper/deleted/.del-ha_berkeley.h:
  Delete: sql/ha_berkeley.h
mysql-test/install_test_db.sh:
  Removed skip option
mysql-test/mysql-test-run.pl:
  Remove bdb option
mysql-test/mysql-test-run.sh:
  Remove bdb option
sql/Makefile.am:
  Remove bdb option
sql/handler.cc:
  Remove references to bdb
sql/lex.h:
  Removed lex for bdb
sql/mysql_priv.h:
  Removed bdb privs
sql/mysqld.cc:
  Removed all options for bdb
sql/set_var.cc:
  Removed variables for bdb
sql/sql_yacc.yy:
  Removed yacc for bdb
parent 21bb4f94

mysql-test/install_test_db.sh

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ basedir=. 
EXTRA_ARG="--language=../sql/share/english/ --character-sets-dir=../sql/share/charsets/"

fi



mysqld_boot=" $execdir/mysqld --no-defaults --bootstrap --skip-grant-tables --basedir=$basedir --datadir=$ldata --skip-innodb --skip-ndbcluster --skip-bdb --tmpdir=. $EXTRA_ARG"

mysqld_boot=" $execdir/mysqld --no-defaults --bootstrap --skip-grant-tables --basedir=$basedir --datadir=$ldata --skip-innodb --skip-ndbcluster --tmpdir=. $EXTRA_ARG"

echo "running $mysqld_boot"



if $scriptdir/mysql_create_system_tables test $mdata $hostname | $mysqld_boot

mysql-test/mysql-test-run.pl

+0 −3
Original line number Diff line number Diff line
@@ -2108,7 +2108,6 @@ sub install_db ($$) { 
  mtr_add_arg($args, "--datadir=%s", $data_dir);

  mtr_add_arg($args, "--skip-innodb");

  mtr_add_arg($args, "--skip-ndbcluster");

  mtr_add_arg($args, "--skip-bdb");

  mtr_add_arg($args, "--tmpdir=.");



  if ( ! $opt_netware )
@@ -2201,7 +2200,6 @@ basedir = $path_my_basedir 
server_id           = $server_id

skip-stack-trace

skip-innodb

skip-bdb

skip-ndbcluster

EOF

;
@@ -2615,7 +2613,6 @@ sub mysqld_arguments ($$$$$) { 
  if ( $opt_valgrind_mysqld )

  {

    mtr_add_arg($args, "%s--skip-safemalloc", $prefix);

    mtr_add_arg($args, "%s--skip-bdb", $prefix);

  }



  my $pidfile;

mysql-test/mysql-test-run.sh

+2 −2
Original line number Diff line number Diff line
@@ -536,8 +536,8 @@ while test $# -gt 0; do 
    --valgrind | --valgrind-all)

      find_valgrind;

      VALGRIND=$FIND_VALGRIND

      EXTRA_MASTER_MYSQLD_OPT="$EXTRA_MASTER_MYSQLD_OPT --skip-safemalloc --skip-bdb"

      EXTRA_SLAVE_MYSQLD_OPT="$EXTRA_SLAVE_MYSQLD_OPT --skip-safemalloc --skip-bdb"

      EXTRA_MASTER_MYSQLD_OPT="$EXTRA_MASTER_MYSQLD_OPT --skip-safemalloc"

      EXTRA_SLAVE_MYSQLD_OPT="$EXTRA_SLAVE_MYSQLD_OPT --skip-safemalloc"

      SLEEP_TIME_AFTER_RESTART=10

      SLEEP_TIME_FOR_DELETE=60

      USE_RUNNING_SERVER=0

sql/Makefile.am

+2 −5
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ noinst_HEADERS = item.h item_func.h item_sum.h item_cmpfunc.h \ 
			sql_manager.h sql_map.h sql_string.h unireg.h \

			sql_error.h field.h handler.h mysqld_suffix.h \

			ha_heap.h ha_myisam.h ha_myisammrg.h ha_partition.h \

			ha_innodb.h  ha_berkeley.h ha_federated.h \

			ha_innodb.h  ha_federated.h \

			ha_ndbcluster.h ha_ndbcluster_binlog.h \

			ha_ndbcluster_tables.h \

			opt_range.h protocol.h rpl_tblmap.h \
@@ -88,7 +88,7 @@ mysqld_SOURCES = sql_lex.cc sql_handler.cc sql_partition.cc \ 
			discover.cc time.cc opt_range.cc opt_sum.cc \

		   	records.cc filesort.cc handler.cc \

			ha_heap.cc ha_myisam.cc ha_myisammrg.cc \

			ha_partition.cc ha_innodb.cc ha_berkeley.cc \

			ha_partition.cc ha_innodb.cc \

			ha_federated.cc \

                        ha_ndbcluster.cc ha_ndbcluster_binlog.cc \

			sql_db.cc sql_table.cc sql_rename.cc sql_crypt.cc \
@@ -161,9 +161,6 @@ lex_hash.h: gen_lex_hash$(EXEEXT) 
		./gen_lex_hash$(EXEEXT) > $@



# the following three should eventually be moved out of this directory

ha_berkeley.o:	ha_berkeley.cc ha_berkeley.h

		$(CXXCOMPILE) $(LM_CFLAGS) -c $<



ha_ndbcluster.o:ha_ndbcluster.cc ha_ndbcluster.h

		$(CXXCOMPILE) @ndbcluster_includes@ $(LM_CFLAGS) -c $<

sql/ha_berkeley.cc

deleted100644 → 0
+0 −2754

File deleted.

Preview size limit exceeded, changes collapsed.