Commit bcc3b17f authored by unknown's avatar unknown
Browse files

Removed bdb test cases. 


BitKeeper/deleted/.del-bdb-alter-table-1.result:
  Rename: mysql-test/r/bdb-alter-table-1.result -> BitKeeper/deleted/.del-bdb-alter-table-1.result
BitKeeper/deleted/.del-bdb-alter-table-1.test:
  Rename: mysql-test/t/bdb-alter-table-1.test -> BitKeeper/deleted/.del-bdb-alter-table-1.test
BitKeeper/deleted/.del-bdb-alter-table-2-master.opt:
  Rename: mysql-test/t/bdb-alter-table-2-master.opt -> BitKeeper/deleted/.del-bdb-alter-table-2-master.opt
BitKeeper/deleted/.del-bdb-alter-table-2.result:
  Rename: mysql-test/r/bdb-alter-table-2.result -> BitKeeper/deleted/.del-bdb-alter-table-2.result
BitKeeper/deleted/.del-bdb-alter-table-2.test:
  Rename: mysql-test/t/bdb-alter-table-2.test -> BitKeeper/deleted/.del-bdb-alter-table-2.test
BitKeeper/deleted/.del-bdb-crash.result:
  Rename: mysql-test/r/bdb-crash.result -> BitKeeper/deleted/.del-bdb-crash.result
BitKeeper/deleted/.del-bdb-crash.test:
  Rename: mysql-test/t/bdb-crash.test -> BitKeeper/deleted/.del-bdb-crash.test
BitKeeper/deleted/.del-bdb-deadlock.result:
  Rename: mysql-test/r/bdb-deadlock.result -> BitKeeper/deleted/.del-bdb-deadlock.result
BitKeeper/deleted/.del-bdb-deadlock.test:
  Rename: mysql-test/t/bdb-deadlock.test -> BitKeeper/deleted/.del-bdb-deadlock.test
BitKeeper/deleted/.del-bdb-deadlock.tminus:
  Rename: mysql-test/t/bdb-deadlock.tminus -> BitKeeper/deleted/.del-bdb-deadlock.tminus
BitKeeper/deleted/.del-bdb.result:
  Rename: mysql-test/r/bdb.result -> BitKeeper/deleted/.del-bdb.result
BitKeeper/deleted/.del-bdb.test:
  Rename: mysql-test/t/bdb.test -> BitKeeper/deleted/.del-bdb.test
BitKeeper/deleted/.del-bdb_cache-master.opt~e54093fff2e73631:
  Rename: mysql-test/t/bdb_cache-master.opt -> BitKeeper/deleted/.del-bdb_cache-master.opt~e54093fff2e73631
BitKeeper/deleted/.del-bdb_cache.result~5767ff4f4b228a66:
  Rename: mysql-test/r/bdb_cache.result -> BitKeeper/deleted/.del-bdb_cache.result~5767ff4f4b228a66
BitKeeper/deleted/.del-bdb_cache.test~818df448403a5598:
  Rename: mysql-test/t/bdb_cache.test -> BitKeeper/deleted/.del-bdb_cache.test~818df448403a5598
BitKeeper/deleted/.del-bdb_gis.result:
  Rename: mysql-test/r/bdb_gis.result -> BitKeeper/deleted/.del-bdb_gis.result
BitKeeper/deleted/.del-bdb_gis.test:
  Rename: mysql-test/t/bdb_gis.test -> BitKeeper/deleted/.del-bdb_gis.test
BitKeeper/deleted/.del-have_bdb.inc:
  Rename: mysql-test/include/have_bdb.inc -> BitKeeper/deleted/.del-have_bdb.inc
BitKeeper/deleted/.del-have_bdb.require:
  Rename: mysql-test/r/have_bdb.require -> BitKeeper/deleted/.del-have_bdb.require
BitKeeper/deleted/.del-index_merge_bdb.result:
  Rename: mysql-test/r/index_merge_bdb.result -> BitKeeper/deleted/.del-index_merge_bdb.result
BitKeeper/deleted/.del-index_merge_bdb.test:
  Rename: mysql-test/t/index_merge_bdb.test -> BitKeeper/deleted/.del-index_merge_bdb.test
BitKeeper/deleted/.del-ps_6bdb.result:
  Rename: mysql-test/r/ps_6bdb.result -> BitKeeper/deleted/.del-ps_6bdb.result
BitKeeper/deleted/.del-ps_6bdb.test:
  Rename: mysql-test/t/ps_6bdb.test -> BitKeeper/deleted/.del-ps_6bdb.test
BitKeeper/deleted/.del-rowid_order_bdb.result:
  Rename: mysql-test/r/rowid_order_bdb.result -> BitKeeper/deleted/.del-rowid_order_bdb.result
BitKeeper/deleted/.del-rowid_order_bdb.test:
  Rename: mysql-test/t/rowid_order_bdb.test -> BitKeeper/deleted/.del-rowid_order_bdb.test
BitKeeper/deleted/.del-sql_manager.h:
  Rename: sql/sql_manager.h -> BitKeeper/deleted/.del-sql_manager.h
libmysqld/Makefile.am:
  Removed bdb from the engine
mysql-test/extra/binlog_tests/binlog.test:
  Removed bdb support
mysql-test/r/binlog_stm_binlog.result:
  Updated results
mysql-test/r/ctype_utf8.result:
  Removed bdb support
mysql-test/t/ctype_utf8.test:
  Removed bdb support
sql/CMakeLists.txt:
  Removed file for Windows build
sql/Makefile.am:
  Removed unneeded include file.
sql/sql_manager.cc:
  Removed include file.
parent 189b8bc5

libmysqld/Makefile.am

+1 −5
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ noinst_HEADERS = embedded_priv.h emb_qcache.h 


sqlsources = derror.cc field.cc field_conv.cc strfunc.cc filesort.cc \

	ha_heap.cc ha_myisam.cc ha_myisammrg.cc \

	ha_innodb.cc ha_berkeley.cc ha_federated.cc ha_ndbcluster.cc \

	ha_innodb.cc ha_federated.cc ha_ndbcluster.cc \

	ha_ndbcluster_binlog.cc ha_partition.cc \

	handler.cc sql_handler.cc \

	hostname.cc init.cc password.c \
@@ -96,10 +96,6 @@ yassl_inc_libs= $(top_srcdir)/extra/yassl/src/.libs/libyassl.a \ 
endif



# Storage engine specific compilation options



ha_berkeley.o:  ha_berkeley.cc

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



ha_ndbcluster.o:ha_ndbcluster.cc

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

mysql-test/extra/binlog_tests/binlog.test

+1 −2
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ 
#



-- source include/not_embedded.inc

-- source include/have_bdb.inc

-- source include/have_innodb.inc

-- source include/have_debug.inc
@@ -12,7 +11,7 @@ drop table if exists t1, t2; 
--enable_warnings

reset master;



create table t1 (a int) engine=bdb;

create table t1 (a int) engine=innodb;

create table t2 (a int) engine=innodb;

begin;

insert t1 values (5);

mysql-test/include/have_bdb.inc

deleted100644 → 0
+0 −4
Original line number Diff line number Diff line 
-- require r/have_bdb.require

disable_query_log;

show variables like "have_bdb";

enable_query_log;

mysql-test/r/bdb-alter-table-1.result

deleted100644 → 0
+0 −11
Original line number Diff line number Diff line 
drop table if exists t1;

create table t1(objid BIGINT not null, tablename  varchar(64), oid BIGINT not null, test BIGINT,  PRIMARY KEY (objid), UNIQUE(tablename))  engine=BDB;

insert into t1 values(1, 't1',4,9);

insert into t1 values(2, 'metatable',1,9);

insert into t1 values(3, 'metaindex',1,9 );

select * from t1;

objid	tablename	oid	test

1	t1	4	9

2	metatable	1	9

3	metaindex	1	9

alter table t1 drop column test;

mysql-test/r/bdb-alter-table-2.result

deleted100644 → 0
+0 −6
Original line number Diff line number Diff line 
select * from t1;

objid	tablename	oid

1	t1	4

2	metatable	1

3	metaindex	1

drop table t1;