mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-02 03:51:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Refs #1531. The fix is don't compile {{{test_txn_abort6}}} under BDB, rather than hacking around with the #ifdefs inside the code. I noticed this because the main line wouldn't compile tonight.

Browse source 
git-svn-id: file:///svn/toku/tokudb@10513 c7de825b-a66e-492c-adef-691d508d4ae1
This commit is contained in:
Bradley C. Kuszmaul 2013-04-16 23:57:46 -04:00 • committed by Yoni Fogel
parent f84c352b63
commit 4686fb2b3e
2 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/tests/Makefile
View file

@ -74,6 +74,7 @@ BDB_DONTRUN_TESTS = \
test1426 \ test1426 \
test1572 \ test1572 \
test_logflush \ test_logflush \
test_txn_abort6 \
test_txn_abort8 \ test_txn_abort8 \
test_txn_abort9 \ test_txn_abort9 \
test_txn_close_open_commit \ test_txn_close_open_commit \
@ -379,4 +380,3 @@ dumpit:
test_thread_stack.%run: test_thread_stack.%$(BINSUF) test_thread_stack.%run: test_thread_stack.%$(BINSUF)
./$< -a -thread_stack 16384 && \ ./$< -a -thread_stack 16384 && \
./$< -a -thread_stack 16384 -resume $(SUMMARIZE_CMD) ./$< -a -thread_stack 16384 -resume $(SUMMARIZE_CMD)

2
src/tests/test_txn_abort6.c
View file

@ -109,7 +109,6 @@ test_txn_abort (int n, int which_guys_to_abort) {
int int
test_main(int argc, const char *argv[]) { test_main(int argc, const char *argv[]) {
#if IS_TDB // This test is inappropriate for BDB. It requires finer grained locking that BDB supports.
int i,j; int i,j;
for (i = 1; i < argc; i++) { for (i = 1; i < argc; i++) {
const char *arg = argv[i]; const char *arg = argv[i];
@ -124,6 +123,5 @@ test_main(int argc, const char *argv[]) {
for (i=1; i<100; i*=2) for (i=1; i<100; i*=2)
test_txn_abort(i, j); test_txn_abort(i, j);
if (verbose>0) printf("OK\n"); if (verbose>0) printf("OK\n");
#endif
return 0; return 0;
} }