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

Merge in latest changes from 1032b into 1332+1343.

Browse source 
About to merge 1332+1343 back to main line.
Addresses #1032, #1343.
{{{
svn merge -r8595:8646 https://svn.tokutek.com/tokudb/toku/tokudb.1032b
}}}


git-svn-id: file:///svn/toku/tokudb.1032b+1343@8648 c7de825b-a66e-492c-adef-691d508d4ae1
This commit is contained in:
Bradley C. Kuszmaul 2013-04-16 23:57:35 -04:00 • committed by Yoni Fogel
parent 9cdbdd4147
commit eddad2d02c
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
db-benchmark-test/db-benchmark-test.c
View file

@ -116,7 +116,6 @@ static void benchmark_setup (void) {
if (do_transactions) {
r=dbenv->txn_begin(dbenv, 0, &tid, 0); CKERR(r);
if (singlex) do_prelock(db, tid);
}
if (pagesize && db->set_pagesize) {
r = db->set_pagesize(db, pagesize);
@ -282,6 +281,8 @@ static int print_usage (const char *argv0) {
fprintf(stderr, " --compressibility C creates data that should compress by about a factor C. Default C is large. C is an float.\n");
fprintf(stderr, " --xcount N how many insertions per transaction (default=%d)\n", DEFAULT_ITEMS_PER_TRANSACTION);
fprintf(stderr, " --singlex Run the whole job as a single transaction. (Default don't run as a single transaction.)\n");
fprintf(stderr, " --prelock Prelock the database.\n");
fprintf(stderr, " --prelockflag Prelock the database and send the DB_PRELOCKED_WRITE flag.\n");
fprintf(stderr, " --abort Abort the singlex after the transaction is over. (Requires --singlex.)\n");
fprintf(stderr, " --nolog If transactions are used, then don't write the recovery log\n");
fprintf(stderr, " --periter N how many insertions per iteration (default=%d)\n", DEFAULT_ITEMS_TO_INSERT_PER_ITERATION);