diff options
| author | unknown <brian@zim.(none)> | 2006-08-10 01:50:37 -0700 |
|---|---|---|
| committer | unknown <brian@zim.(none)> | 2006-08-10 01:50:37 -0700 |
| commit | 04d2b020a49dfc129d587380aba50e5bac6f393b (patch) | |
| tree | 1c6911fadb9ec6864b7487295deb7ad6bfa7d0d1 /mysql-test | |
| parent | 21bb4f9465751b3a93efca2415dc215de3c55b0f (diff) | |
| download | mariadb-git-04d2b020a49dfc129d587380aba50e5bac6f393b.tar.gz | |
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
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/install_test_db.sh | 2 | ||||
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 3 | ||||
| -rw-r--r-- | mysql-test/mysql-test-run.sh | 4 |
3 files changed, 3 insertions, 6 deletions
diff --git a/mysql-test/install_test_db.sh b/mysql-test/install_test_db.sh index 9006957019a..d7c19438836 100644 --- a/mysql-test/install_test_db.sh +++ b/mysql-test/install_test_db.sh @@ -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 diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 5d6f39bc882..ccfd957420e 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -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; diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index b74965b706e..f2200c4be07 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -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 |