summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Bostic <keith@wiredtiger.com>2013-01-01 09:53:10 +0000
committerKeith Bostic <keith@wiredtiger.com>2013-01-01 09:53:10 +0000
commitfe85e511eb3cc77709a07a0937917aa11c08b809 (patch)
tree47a90671496d67d5fa713c26b7f9a5921e99149e
parent2562fae7a22b5dc0d53c33938808bdd4e7e49dcb (diff)
parent963d37a4e6de35e74a7ebf534b725e692dbca8e9 (diff)
downloadmongo-fe85e511eb3cc77709a07a0937917aa11c08b809.tar.gz
Merge branch 'develop' into compact-in-thread
-rw-r--r--LICENSE2
-rwxr-xr-xbench/wtperf/runners/get_ckpt.py2
-rw-r--r--bench/wtperf/wtperf.c153
-rw-r--r--dist/api_data.py3
-rw-r--r--dist/serial.py45
-rw-r--r--examples/c/ex_access.c2
-rw-r--r--examples/c/ex_all.c2
-rw-r--r--examples/c/ex_call_center.c2
-rw-r--r--examples/c/ex_config.c2
-rw-r--r--examples/c/ex_cursor.c2
-rw-r--r--examples/c/ex_extending.c2
-rw-r--r--examples/c/ex_file.c2
-rw-r--r--examples/c/ex_hello.c2
-rw-r--r--examples/c/ex_pack.c2
-rw-r--r--examples/c/ex_process.c2
-rw-r--r--examples/c/ex_schema.c2
-rw-r--r--examples/c/ex_stat.c2
-rw-r--r--examples/c/ex_thread.c2
-rwxr-xr-xexamples/python/ex_access.py2
-rw-r--r--ext/collators/reverse/reverse_collator.c2
-rw-r--r--ext/compressors/bzip2/bzip2_compress.c2
-rw-r--r--ext/compressors/nop/nop_compress.c2
-rw-r--r--ext/compressors/snappy/snappy_compress.c2
-rw-r--r--lang/python/fpacking.py2
-rw-r--r--lang/python/intpack-test.py2
-rw-r--r--lang/python/intpacking.py2
-rw-r--r--lang/python/packing-test.py2
-rw-r--r--lang/python/packing.py2
-rw-r--r--lang/python/setup.py4
-rw-r--r--lang/python/src/server.py2
-rw-r--r--lang/python/src/wiredtiger/__init__.py2
-rw-r--r--lang/python/src/wiredtiger/impl/__init__.py2
-rw-r--r--lang/python/src/wiredtiger/util.py2
-rw-r--r--lang/python/wiredtiger.i2
-rw-r--r--src/api/api_version.c2
-rw-r--r--src/block/block_addr.c2
-rw-r--r--src/block/block_ckpt.c2
-rw-r--r--src/block/block_compact.c2
-rw-r--r--src/block/block_ext.c2
-rw-r--r--src/block/block_mgr.c2
-rw-r--r--src/block/block_open.c2
-rw-r--r--src/block/block_read.c2
-rw-r--r--src/block/block_slvg.c2
-rw-r--r--src/block/block_vrfy.c2
-rw-r--r--src/block/block_write.c2
-rw-r--r--src/bloom/bloom.c2
-rw-r--r--src/btree/bt_bulk.c2
-rw-r--r--src/btree/bt_compact.c2
-rw-r--r--src/btree/bt_curnext.c2
-rw-r--r--src/btree/bt_curprev.c2
-rw-r--r--src/btree/bt_cursor.c2
-rw-r--r--src/btree/bt_debug.c2
-rw-r--r--src/btree/bt_discard.c2
-rw-r--r--src/btree/bt_evict.c12
-rw-r--r--src/btree/bt_handle.c2
-rw-r--r--src/btree/bt_huffman.c2
-rw-r--r--src/btree/bt_io.c2
-rw-r--r--src/btree/bt_misc.c2
-rw-r--r--src/btree/bt_ovfl.c2
-rw-r--r--src/btree/bt_page.c2
-rw-r--r--src/btree/bt_read.c2
-rw-r--r--src/btree/bt_ret.c2
-rw-r--r--src/btree/bt_slvg.c2
-rw-r--r--src/btree/bt_stat.c2
-rw-r--r--src/btree/bt_sync.c2
-rw-r--r--src/btree/bt_upgrade.c2
-rw-r--r--src/btree/bt_vrfy.c2
-rw-r--r--src/btree/bt_vrfy_dsk.c2
-rw-r--r--src/btree/bt_walk.c12
-rw-r--r--src/btree/col_modify.c8
-rw-r--r--src/btree/col_srch.c2
-rw-r--r--src/btree/rec_evict.c2
-rw-r--r--src/btree/rec_track.c2
-rw-r--r--src/btree/rec_write.c2
-rw-r--r--src/btree/row_key.c2
-rw-r--r--src/btree/row_modify.c14
-rw-r--r--src/btree/row_srch.c2
-rw-r--r--src/config/config.c2
-rw-r--r--src/config/config_check.c2
-rw-r--r--src/config/config_collapse.c2
-rw-r--r--src/config/config_concat.c2
-rw-r--r--src/conn/conn_api.c2
-rw-r--r--src/conn/conn_btree.c2
-rw-r--r--src/conn/conn_cache.c2
-rw-r--r--src/conn/conn_cache_pool.c2
-rw-r--r--src/conn/conn_handle.c2
-rw-r--r--src/conn/conn_open.c2
-rw-r--r--src/conn/conn_stat.c2
-rw-r--r--src/cursor/cur_backup.c2
-rw-r--r--src/cursor/cur_bulk.c2
-rw-r--r--src/cursor/cur_config.c2
-rw-r--r--src/cursor/cur_dump.c2
-rw-r--r--src/cursor/cur_file.c2
-rw-r--r--src/cursor/cur_index.c2
-rw-r--r--src/cursor/cur_stat.c2
-rw-r--r--src/cursor/cur_std.c2
-rw-r--r--src/cursor/cur_table.c2
-rwxr-xr-xsrc/docs/build-javadoc.sh2
-rw-r--r--src/docs/style/footer.html4
-rwxr-xr-xsrc/docs/tools/fixlinks.py2
-rw-r--r--src/include/api.h2
-rw-r--r--src/include/bitstring.i2
-rw-r--r--src/include/block.h2
-rw-r--r--src/include/bloom.h2
-rw-r--r--src/include/btmem.h2
-rw-r--r--src/include/btree.h2
-rw-r--r--src/include/btree.i2
-rw-r--r--src/include/cache.h2
-rw-r--r--src/include/cache.i2
-rw-r--r--src/include/cell.i2
-rw-r--r--src/include/column.i2
-rw-r--r--src/include/config.h2
-rw-r--r--src/include/connection.h2
-rw-r--r--src/include/cursor.h2
-rw-r--r--src/include/cursor.i2
-rw-r--r--src/include/dlh.h2
-rw-r--r--src/include/error.h2
-rw-r--r--src/include/intpack.i2
-rw-r--r--src/include/log.h2
-rw-r--r--src/include/lsm.h2
-rw-r--r--src/include/meta.h2
-rw-r--r--src/include/misc.h2
-rw-r--r--src/include/mutex.h2
-rw-r--r--src/include/mutex.i2
-rw-r--r--src/include/os.h2
-rw-r--r--src/include/packing.i2
-rw-r--r--src/include/posix.h2
-rw-r--r--src/include/schema.h2
-rw-r--r--src/include/serial_funcs.i131
-rw-r--r--src/include/session.h2
-rw-r--r--src/include/stat.h2
-rw-r--r--src/include/txn.h2
-rw-r--r--src/include/txn.i2
-rw-r--r--src/include/verify_build.h2
-rw-r--r--src/include/wiredtiger.in9
-rw-r--r--src/include/wiredtiger_ext.h2
-rw-r--r--src/include/wt_internal.h2
-rw-r--r--src/log/log.c2
-rw-r--r--src/lsm/lsm_cursor.c2
-rw-r--r--src/lsm/lsm_dsrc.c2
-rw-r--r--src/lsm/lsm_merge.c2
-rw-r--r--src/lsm/lsm_meta.c2
-rw-r--r--src/lsm/lsm_stat.c2
-rw-r--r--src/lsm/lsm_tree.c2
-rw-r--r--src/lsm/lsm_worker.c2
-rw-r--r--src/meta/meta_api.c2
-rw-r--r--src/meta/meta_apply.c2
-rw-r--r--src/meta/meta_ckpt.c2
-rw-r--r--src/meta/meta_table.c2
-rw-r--r--src/meta/meta_track.c2
-rw-r--r--src/meta/meta_turtle.c2
-rw-r--r--src/os_posix/os_abort.c2
-rw-r--r--src/os_posix/os_alloc.c2
-rw-r--r--src/os_posix/os_dlopen.c2
-rw-r--r--src/os_posix/os_errno.c2
-rw-r--r--src/os_posix/os_exist.c2
-rw-r--r--src/os_posix/os_filesize.c2
-rw-r--r--src/os_posix/os_flock.c2
-rw-r--r--src/os_posix/os_fsync.c2
-rw-r--r--src/os_posix/os_ftruncate.c2
-rw-r--r--src/os_posix/os_getline.c2
-rw-r--r--src/os_posix/os_mtx.c2
-rw-r--r--src/os_posix/os_open.c2
-rw-r--r--src/os_posix/os_priv.c2
-rw-r--r--src/os_posix/os_remove.c2
-rw-r--r--src/os_posix/os_rename.c2
-rw-r--r--src/os_posix/os_rw.c2
-rw-r--r--src/os_posix/os_sleep.c2
-rw-r--r--src/os_posix/os_strtouq.c2
-rw-r--r--src/os_posix/os_thread.c2
-rw-r--r--src/os_posix/os_time.c2
-rw-r--r--src/os_posix/os_yield.c2
-rw-r--r--src/packing/packing.c2
-rw-r--r--src/packing/packing_api.c2
-rw-r--r--src/schema/schema_create.c2
-rw-r--r--src/schema/schema_drop.c2
-rw-r--r--src/schema/schema_list.c2
-rw-r--r--src/schema/schema_open.c2
-rw-r--r--src/schema/schema_plan.c2
-rw-r--r--src/schema/schema_project.c2
-rw-r--r--src/schema/schema_rename.c2
-rw-r--r--src/schema/schema_stat.c2
-rw-r--r--src/schema/schema_truncate.c2
-rw-r--r--src/schema/schema_util.c2
-rw-r--r--src/schema/schema_worker.c2
-rw-r--r--src/session/session_api.c2
-rw-r--r--src/session/session_btree.c2
-rw-r--r--src/session/session_salvage.c2
-rw-r--r--src/support/cksum.c2
-rw-r--r--src/support/err.c18
-rw-r--r--src/support/filename.c2
-rw-r--r--src/support/global.c2
-rw-r--r--src/support/hash_city.c2
-rw-r--r--src/support/hash_fnv.c2
-rw-r--r--src/support/hazard.c2
-rw-r--r--src/support/hex.c2
-rw-r--r--src/support/huffman.c2
-rw-r--r--src/support/pow.c2
-rw-r--r--src/support/rand.c2
-rw-r--r--src/support/scratch.c2
-rw-r--r--src/support/sess_dump.c2
-rw-r--r--src/txn/txn.c2
-rw-r--r--src/txn/txn_ckpt.c2
-rw-r--r--src/utilities/util.h2
-rw-r--r--src/utilities/util_backup.c2
-rw-r--r--src/utilities/util_compact.c2
-rw-r--r--src/utilities/util_cpyright.c4
-rw-r--r--src/utilities/util_create.c2
-rw-r--r--src/utilities/util_drop.c2
-rw-r--r--src/utilities/util_dump.c2
-rw-r--r--src/utilities/util_getopt.c2
-rw-r--r--src/utilities/util_list.c2
-rw-r--r--src/utilities/util_load.c2
-rw-r--r--src/utilities/util_loadtext.c2
-rw-r--r--src/utilities/util_main.c2
-rw-r--r--src/utilities/util_misc.c2
-rw-r--r--src/utilities/util_printlog.c2
-rw-r--r--src/utilities/util_read.c2
-rw-r--r--src/utilities/util_rename.c2
-rw-r--r--src/utilities/util_salvage.c2
-rw-r--r--src/utilities/util_stat.c2
-rw-r--r--src/utilities/util_upgrade.c2
-rw-r--r--src/utilities/util_verbose.c2
-rw-r--r--src/utilities/util_verify.c2
-rw-r--r--src/utilities/util_write.c2
-rw-r--r--test/bloom/test_bloom.c2
-rw-r--r--test/fops/file.c2
-rw-r--r--test/fops/fops.c2
-rw-r--r--test/fops/t.c2
-rw-r--r--test/fops/thread.h2
-rw-r--r--test/format/bdb.c2
-rw-r--r--test/format/config.c2
-rw-r--r--test/format/config.h2
-rw-r--r--test/format/format.h2
-rw-r--r--test/format/t.c2
-rw-r--r--test/format/util.c2
-rw-r--r--test/format/wts.c2
-rw-r--r--test/format/wts_bulk.c2
-rw-r--r--test/format/wts_ops.c2
-rw-r--r--test/packing/intpack-test.c2
-rw-r--r--test/packing/intpack-test2.c2
-rw-r--r--test/packing/packing-test.c2
-rw-r--r--test/salvage/salvage.c2
-rw-r--r--test/suite/helper.py2
-rw-r--r--test/suite/run.py2
-rw-r--r--test/suite/suite_random.py2
-rw-r--r--test/suite/suite_subprocess.py2
-rw-r--r--test/suite/test_backup.py2
-rw-r--r--test/suite/test_backup02.py2
-rw-r--r--test/suite/test_base01.py2
-rw-r--r--test/suite/test_base02.py2
-rw-r--r--test/suite/test_base03.py2
-rw-r--r--test/suite/test_base04.py2
-rw-r--r--test/suite/test_base05.py2
-rw-r--r--test/suite/test_bug001.py2
-rw-r--r--test/suite/test_bug002.py2
-rw-r--r--test/suite/test_bug003.py2
-rw-r--r--test/suite/test_bug004.py2
-rw-r--r--test/suite/test_bulk.py2
-rw-r--r--test/suite/test_checkpoint01.py2
-rw-r--r--test/suite/test_checkpoint02.py2
-rw-r--r--test/suite/test_compact.py2
-rw-r--r--test/suite/test_compress01.py2
-rw-r--r--test/suite/test_config01.py2
-rw-r--r--test/suite/test_config02.py2
-rw-r--r--test/suite/test_config03.py2
-rw-r--r--test/suite/test_config04.py2
-rw-r--r--test/suite/test_config05.py2
-rw-r--r--test/suite/test_cursor01.py2
-rw-r--r--test/suite/test_cursor02.py2
-rw-r--r--test/suite/test_cursor03.py2
-rw-r--r--test/suite/test_cursor04.py2
-rw-r--r--test/suite/test_cursor05.py2
-rw-r--r--test/suite/test_cursor_compare.py2
-rw-r--r--test/suite/test_cursor_random.py2
-rw-r--r--test/suite/test_cursor_tracker.py2
-rw-r--r--test/suite/test_drop.py2
-rw-r--r--test/suite/test_drop_create.py2
-rw-r--r--test/suite/test_dump.py2
-rw-r--r--test/suite/test_dupc.py2
-rw-r--r--test/suite/test_empty.py2
-rw-r--r--test/suite/test_excl.py2
-rw-r--r--test/suite/test_gethome.py2
-rw-r--r--test/suite/test_index01.py2
-rw-r--r--test/suite/test_isnew.py2
-rw-r--r--test/suite/test_lsm01.py2
-rw-r--r--test/suite/test_lsm02.py2
-rw-r--r--test/suite/test_nocache.py2
-rw-r--r--test/suite/test_overwrite.py2
-rw-r--r--test/suite/test_priv01.py2
-rw-r--r--test/suite/test_rename.py2
-rw-r--r--test/suite/test_salvage.py2
-rw-r--r--test/suite/test_schema01.py2
-rw-r--r--test/suite/test_schema02.py2
-rw-r--r--test/suite/test_schema03.py2
-rw-r--r--test/suite/test_shared_cache.py2
-rw-r--r--test/suite/test_stat01.py2
-rw-r--r--test/suite/test_truncate01.py2
-rw-r--r--test/suite/test_truncate02.py2
-rw-r--r--test/suite/test_truncate03.py2
-rw-r--r--test/suite/test_txn01.py2
-rw-r--r--test/suite/test_txn02.py2
-rw-r--r--test/suite/test_txn03.py2
-rw-r--r--test/suite/test_upgrade.py2
-rw-r--r--test/suite/test_util01.py2
-rw-r--r--test/suite/test_util02.py2
-rw-r--r--test/suite/test_util03.py2
-rw-r--r--test/suite/test_util04.py2
-rw-r--r--test/suite/test_util07.py2
-rw-r--r--test/suite/test_util08.py2
-rw-r--r--test/suite/test_util09.py2
-rw-r--r--test/suite/test_util11.py2
-rw-r--r--test/suite/test_util12.py2
-rw-r--r--test/suite/test_verify.py2
-rw-r--r--test/suite/test_version.py2
-rw-r--r--test/suite/wtscenario.py2
-rw-r--r--test/suite/wttest.py2
-rw-r--r--test/suite/wtthread.py2
-rw-r--r--test/thread/file.c2
-rw-r--r--test/thread/rw.c2
-rw-r--r--test/thread/stats.c2
-rw-r--r--test/thread/t.c2
-rw-r--r--test/thread/thread.h2
323 files changed, 576 insertions, 461 deletions
diff --git a/LICENSE b/LICENSE
index 6b46629398f..1236a8f2257 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2008-2012 WiredTiger, Inc.
+Copyright (c) 2008-2013 WiredTiger, Inc.
All rights reserved.
This program is free software: you can redistribute it and/or modify it under
diff --git a/bench/wtperf/runners/get_ckpt.py b/bench/wtperf/runners/get_ckpt.py
index 1b7d83a7065..8284122591f 100755
--- a/bench/wtperf/runners/get_ckpt.py
+++ b/bench/wtperf/runners/get_ckpt.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2008-2012 WiredTiger, Inc.
+# Public Domain 2008-2013 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
#
diff --git a/bench/wtperf/wtperf.c b/bench/wtperf/wtperf.c
index b3ba51df631..ec30fe5ab7f 100644
--- a/bench/wtperf/wtperf.c
+++ b/bench/wtperf/wtperf.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2008-2012 WiredTiger, Inc.
+ * Public Domain 2008-2013 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
*
@@ -59,6 +59,7 @@ typedef struct {
uint32_t elapsed_time;
uint32_t populate_threads;/* Number of populate threads. */
uint32_t read_threads; /* Number of read threads. */
+ uint32_t insert_threads;/* Number of insert threads. */
uint32_t update_threads;/* Number of update threads. */
uint32_t verbose;
WT_CONNECTION *conn;
@@ -80,6 +81,8 @@ int lprintf(CONFIG *cfg, int err, uint32_t level, const char *fmt, ...)
#endif
;
void *checkpoint_worker(void *);
+int find_table_count(CONFIG *);
+void *insert_thread(void *);
void *populate_thread(void *);
void print_config(CONFIG *);
void *read_thread(void *);
@@ -97,7 +100,8 @@ void worker(CONFIG *, uint32_t);
/* Worker thread types. */
#define WORKER_READ 0x01
-#define WORKER_UPDATE 0x02
+#define WORKER_INSERT 0x02
+#define WORKER_UPDATE 0x03
/* Default values - these are tiny, we want the basic run to be fast. */
CONFIG default_cfg = {
@@ -117,6 +121,7 @@ CONFIG default_cfg = {
0, /* elapsed_time */
1, /* populate_threads */
2, /* read_threads */
+ 0, /* insert_threads */
0, /* update_threads */
0, /* verbose */
NULL, /* conn */
@@ -143,6 +148,7 @@ CONFIG small_cfg = {
0, /* elapsed_time */
1, /* populate_threads */
8, /* read_threads */
+ 0, /* insert_threads */
0, /* update_threads */
0, /* verbose */
NULL, /* conn */
@@ -169,6 +175,7 @@ CONFIG med_cfg = {
0, /* elapsed_time */
1, /* populate_threads */
16, /* read_threads */
+ 0, /* insert_threads */
0, /* update_threads */
0, /* verbose */
NULL, /* conn */
@@ -195,6 +202,7 @@ CONFIG large_cfg = {
0, /* elapsed_time */
1, /* populate_threads */
16, /* read_threads */
+ 0, /* insert_threads */
0, /* update_threads */
0, /* verbose */
NULL, /* conn */
@@ -207,12 +215,20 @@ const char *debug_cconfig = "verbose=[lsm]";
const char *debug_tconfig = "";
/* Global values shared by threads. */
-uint64_t g_nops;
+/*
+ * g_nins_ops is used to track both insert count and assign keys, so use this
+ * to track insert failures.
+ */
+uint64_t g_nfailedins_ops;
+uint64_t g_nins_ops;
+uint64_t g_npop_ops;
uint64_t g_nread_ops;
uint64_t g_nupdate_ops;
+uint64_t g_nworker_ops;
int g_running;
int g_util_running;
uint32_t g_threads_quit; /* For tracking threads that exit early. */
+/* End global values shared by threads. */
void *
read_thread(void *arg)
@@ -222,6 +238,13 @@ read_thread(void *arg)
}
void *
+insert_thread(void *arg)
+{
+ worker((CONFIG *)arg, WORKER_INSERT);
+ return (NULL);
+}
+
+void *
update_thread(void *arg)
{
worker((CONFIG *)arg, WORKER_UPDATE);
@@ -235,11 +258,12 @@ worker(CONFIG *cfg, uint32_t worker_type)
WT_SESSION *session;
WT_CURSOR *cursor;
const char *op_name = "search";
- char *key_buf, *value;
+ char *data_buf, *key_buf, *value;
int ret, op_ret;
+ uint64_t next_val;
session = NULL;
- key_buf = NULL;
+ data_buf = key_buf = NULL;
op_ret = 0;
conn = cfg->conn;
@@ -248,6 +272,14 @@ worker(CONFIG *cfg, uint32_t worker_type)
ret = ENOMEM;
goto err;
}
+ if (worker_type == WORKER_INSERT) {
+ data_buf = calloc(cfg->data_sz, 1);
+ if (data_buf == NULL) {
+ lprintf(cfg, ENOMEM, 0, "Populate data buffer");
+ goto err;
+ }
+ memset(data_buf, 'a', cfg->data_sz - 1);
+ }
if ((ret = conn->open_session(conn, NULL, NULL, &session)) != 0) {
lprintf(cfg, ret, 0,
@@ -263,16 +295,28 @@ worker(CONFIG *cfg, uint32_t worker_type)
while (g_running) {
/* Get a value in range, avoid zero. */
- sprintf(key_buf, "%d",
- (uint32_t)rand() % (cfg->icount - 1) + 1);
+#define VALUE_RANGE (cfg->icount + g_nins_ops - (cfg->insert_threads + 1))
+ next_val = (worker_type == WORKER_INSERT ?
+ (cfg->icount + ATOMIC_ADD(g_nins_ops, 1)) :
+ (rand() % VALUE_RANGE) + 1);
+ sprintf(key_buf, "%020" PRIu64, next_val);
cursor->set_key(cursor, key_buf);
switch(worker_type) {
case WORKER_READ:
+ op_name = "read";
op_ret = cursor->search(cursor);
if (op_ret == 0)
++g_nread_ops;
break;
+ case WORKER_INSERT:
+ op_name = "insert";
+ cursor->set_value(cursor, data_buf);
+ op_ret = cursor->insert(cursor);
+ if (op_ret != 0)
+ ++g_nfailedins_ops;
+ break;
case WORKER_UPDATE:
+ op_name = "update";
op_ret = cursor->search(cursor);
if (op_ret == 0) {
cursor->get_value(cursor, &value);
@@ -281,7 +325,6 @@ worker(CONFIG *cfg, uint32_t worker_type)
else
value[0] = 'a';
op_ret = cursor->update(cursor);
- op_name = "update";
}
if (op_ret == 0)
++g_nupdate_ops;
@@ -296,13 +339,15 @@ worker(CONFIG *cfg, uint32_t worker_type)
lprintf(cfg, op_ret, 0,
"%s failed for: %s", op_name, key_buf);
else
- ++g_nops;
+ ++g_nworker_ops;
}
err: if (ret != 0)
++g_threads_quit;
if (session != NULL)
session->close(session, NULL);
+ if (data_buf != NULL)
+ free(data_buf);
if (key_buf != NULL)
free(key_buf);
}
@@ -310,7 +355,7 @@ err: if (ret != 0)
/* Retrieve an ID for the next insert operation. */
int get_next_op(uint64_t *op)
{
- *op = ATOMIC_ADD(g_nops, 1);
+ *op = ATOMIC_ADD(g_npop_ops, 1);
return (0);
}
@@ -363,7 +408,7 @@ populate_thread(void *arg)
get_next_op(&op);
if (op > cfg->icount)
break;
- sprintf(key_buf, "%"PRIu64, op);
+ sprintf(key_buf, "%020"PRIu64, op);
cursor->set_key(cursor, key_buf);
if ((ret = cursor->insert(cursor)) != 0) {
lprintf(cfg, ret, 0, "Failed inserting");
@@ -435,12 +480,12 @@ stat_worker(void *arg)
if (cfg->phase == WT_PERF_POP)
lprintf(cfg, 0, cfg->verbose,
"inserts: %" PRIu64 ", elapsed time: %.2f",
- g_nops, secs);
+ g_npop_ops, secs);
else
lprintf(cfg, 0, cfg->verbose,
- "reads: %" PRIu64 " updates: %" PRIu64
- ", elapsed time: %.2f",
- g_nread_ops, g_nupdate_ops, secs);
+ "reads: %" PRIu64 " inserts: %" PRIu64
+ " updates: %" PRIu64 ", elapsed time: %.2f",
+ g_nread_ops, g_nins_ops, g_nupdate_ops, secs);
/* Report data source stats. */
if ((ret = session->open_cursor(session, stat_uri,
@@ -560,7 +605,8 @@ int execute_populate(CONFIG *cfg)
gettimeofday(&cfg->phase_start_time, NULL);
for (cfg->elapsed_time = 0, elapsed = last_ops = 0;
- g_nops < cfg->icount && g_threads_quit < cfg->populate_threads;) {
+ g_npop_ops < cfg->icount &&
+ g_threads_quit < cfg->populate_threads;) {
/*
* Sleep for 100th of a second, report_interval is in second
* granularity, so adjust accordingly.
@@ -570,8 +616,8 @@ int execute_populate(CONFIG *cfg)
if (elapsed % 100 == 0 &&
(elapsed / 100) % cfg->report_interval == 0) {
lprintf(cfg, 0, 1, "%" PRIu64 " ops in %d secs",
- g_nops - last_ops, cfg->report_interval);
- last_ops = g_nops;
+ g_npop_ops - last_ops, cfg->report_interval);
+ last_ops = g_npop_ops;
}
}
if (g_threads_quit == cfg->populate_threads) {
@@ -600,7 +646,7 @@ int execute_populate(CONFIG *cfg)
int execute_workload(CONFIG *cfg)
{
- pthread_t *rthreads, *uthreads;
+ pthread_t *ithreads, *rthreads, *uthreads;
int ret;
uint64_t last_reads, last_updates;
@@ -611,6 +657,10 @@ int execute_workload(CONFIG *cfg)
cfg, cfg->read_threads, &rthreads, read_thread)) != 0)
return (ret);
+ if (cfg->insert_threads != 0 && (ret = start_threads(
+ cfg, cfg->insert_threads, &ithreads, insert_thread)) != 0)
+ return (ret);
+
if (cfg->update_threads != 0 && (ret = start_threads(
cfg, cfg->update_threads, &uthreads, update_thread)) != 0)
return (ret);
@@ -641,6 +691,10 @@ int execute_workload(CONFIG *cfg)
(ret = stop_threads(cfg, cfg->read_threads, rthreads)) != 0)
return (ret);
+ if (cfg->insert_threads != 0 &&
+ (ret = stop_threads(cfg, cfg->insert_threads, ithreads)) != 0)
+ return (ret);
+
if (cfg->update_threads != 0 &&
(ret = stop_threads(cfg, cfg->update_threads, uthreads)) != 0)
return (ret);
@@ -648,12 +702,49 @@ int execute_workload(CONFIG *cfg)
return (0);
}
+/*
+ * Ensure that icount matches the number of records in the
+ * existing table.
+ */
+int find_table_count(CONFIG *cfg)
+{
+ WT_CONNECTION *conn;
+ WT_CURSOR *cursor;
+ WT_SESSION *session;
+ char *key;
+ int ret;
+
+ conn = cfg->conn;
+
+ if ((ret = conn->open_session(conn, NULL, NULL, &session)) != 0) {
+ lprintf(cfg, ret, 0,
+ "open_session failed finding existing table count");
+ goto err;
+ }
+ if ((ret = session->open_cursor(session, cfg->uri,
+ NULL, NULL, &cursor)) != 0) {
+ lprintf(cfg, ret, 0,
+ "open_cursor failed finding existing table count");
+ goto err;
+ }
+ if ((ret = cursor->prev(cursor)) != 0) {
+ lprintf(cfg, ret, 0,
+ "cursor prev failed finding existing table count");
+ goto err;
+ }
+ cursor->get_key(cursor, &key);
+ cfg->icount = atoi(key);
+
+err: session->close(session, NULL);
+ return (ret);
+}
+
int main(int argc, char **argv)
{
CONFIG cfg;
WT_CONNECTION *conn;
const char *user_cconfig, *user_tconfig;
- const char *opts = "C:P:R:U:T:c:d:eh:i:k:l:r:s:t:u:v:SML";
+ const char *opts = "C:I:P:R:U:T:c:d:eh:i:k:l:r:s:t:u:v:SML";
char *cc_buf, *tc_buf;
int ch, checkpoint_created, ret, stat_created;
pthread_t checkpoint, stat;
@@ -729,6 +820,9 @@ int main(int argc, char **argv)
case 'C':
user_cconfig = optarg;
break;
+ case 'I':
+ cfg.insert_threads = (uint32_t)atoi(optarg);
+ break;
case 'P':
cfg.populate_threads = (uint32_t)atoi(optarg);
break;
@@ -827,20 +921,27 @@ int main(int argc, char **argv)
}
if (cfg.create != 0 && execute_populate(&cfg) != 0)
goto err;
+ /* If we aren't populating, set the insert count. */
+ if (cfg.create == 0 && find_table_count(&cfg) != 0)
+ goto err;
if (cfg.run_time != 0 &&
- (cfg.read_threads != 0 || cfg.update_threads != 0) &&
+ cfg.read_threads + cfg.insert_threads + cfg.update_threads != 0 &&
(ret = execute_workload(&cfg)) != 0)
goto err;
lprintf(&cfg, 0, 1,
- "Ran performance test example with %d read threads"
- " and %d update threads for %d seconds.",
- cfg.read_threads, cfg.update_threads, cfg.run_time);
+ "Ran performance test example with %d read threads, %d insert"
+ " threads and %d update threads for %d seconds.",
+ cfg.read_threads, cfg.insert_threads,
+ cfg.update_threads, cfg.run_time);
if (cfg.read_threads != 0)
lprintf(&cfg, 0, 1,
"Executed %" PRIu64 " read operations", g_nread_ops);
+ if (cfg.insert_threads != 0)
+ lprintf(&cfg, 0, 1,
+ "Executed %" PRIu64 " insert operations", g_nins_ops);
if (cfg.update_threads != 0)
lprintf(&cfg, 0, 1,
"Executed %" PRIu64 " update operations", g_nupdate_ops);
@@ -879,7 +980,7 @@ start_threads(
int ret;
g_running = 1;
- g_nops = g_nread_ops = g_nupdate_ops = 0;
+ g_npop_ops = g_nread_ops = g_nupdate_ops = 0;
g_threads_quit = 0;
threads = calloc(num, sizeof(pthread_t *));
if (threads == NULL)
@@ -1006,6 +1107,7 @@ void print_config(CONFIG *cfg)
printf("\t Reporting interval: %d\n", cfg->report_interval);
printf("\t Workload period: %d\n", cfg->run_time);
printf("\t Number read threads: %d\n", cfg->read_threads);
+ printf("\t Number insert threads: %d\n", cfg->insert_threads);
printf("\t Number update threads: %d\n", cfg->update_threads);
printf("\t Verbosity: %d\n", cfg->verbose);
}
@@ -1017,6 +1119,7 @@ void usage(void)
printf("\t-M Use a medium default configuration\n");
printf("\t-L Use a large default configuration\n");
printf("\t-C <string> additional connection configuration\n");
+ printf("\t-I <int> number of insert worker threads\n");
printf("\t-P <int> number of populate threads\n");
printf("\t-R <int> number of read threads\n");
printf("\t-U <int> number of update threads\n");
diff --git a/dist/api_data.py b/dist/api_data.py
index 439c70922d2..2f621669101 100644
--- a/dist/api_data.py
+++ b/dist/api_data.py
@@ -254,7 +254,8 @@ connection_runtime_config = [
Config('name', '', r'''
name of a cache that is shared between databases'''),
Config('size', '500MB', r'''
- maximum memory to allocate for the shared cache''',
+ maximum memory to allocate for the shared cache. Setting this
+ will update the value if one is already set''',
min='1MB', max='10TB')
]),
Config('cache_size', '100MB', r'''
diff --git a/dist/serial.py b/dist/serial.py
index 159a2ba3017..1dc257c41b5 100644
--- a/dist/serial.py
+++ b/dist/serial.py
@@ -78,10 +78,11 @@ def output(entry, f):
f.write('''
typedef struct {
''')
+ sizes = 0;
for l in entry.args:
f.write('\t' + decl(l) + ';\n')
if l.sized:
- f.write('\tsize_t ' + l.name + '_size;\n')
+ sizes = 1
f.write('\tint ' + l.name + '_taken;\n')
f.write('} __wt_' + entry.name + '_args;\n\n')
@@ -95,12 +96,13 @@ typedef struct {
o += ', ' + decl(l)
o += ')'
f.write('\n'.join('\t' + l for l in textwrap.wrap(o, 70)))
- f.write('''
-{
-\t__wt_''' + entry.name + '''_args _args, *args = &_args;
-\tWT_DECL_RET;
+ f.write(' {\n')
+ f.write('\t__wt_''' + entry.name + '_args _args, *args = &_args;\n')
+ f.write('\tWT_DECL_RET;\n')
+ if sizes:
+ f.write('\tsize_t incr_mem;\n')
+ f.write('\n')
-''')
for l in entry.args:
if l.sized:
f.write('''\tif (''' + l.name + '''p == NULL)
@@ -108,7 +110,6 @@ typedef struct {
\telse {
\t\targs->''' + l.name + ''' = *''' + l.name + '''p;
\t\t*''' + l.name + '''p = NULL;
-\t\targs->''' + l.name + '''_size = ''' + l.name + '''_size;
\t}
\targs->''' + l.name + '''_taken = 0;
@@ -118,11 +119,24 @@ typedef struct {
f.write('\t__wt_spin_lock(session, &S2C(session)->serial_lock);\n')
f.write('\tret = __wt_' + entry.name + '_serial_func(session, args);\n')
f.write('\t__wt_spin_unlock(session, &S2C(session)->serial_lock);\n\n')
- for l in entry.args:
- if not l.sized:
- continue
- f.write('\tif (!args->' + l.name + '_taken)\n')
- f.write('\t\t__wt_free(session, args->' + l.name + ');\n')
+
+ if sizes:
+ f.write('\tincr_mem = 0;\n')
+ for l in entry.args:
+ if not l.sized:
+ continue
+ f.write('\tif (args->' + l.name + '_taken) {\n')
+ f.write('\t\tWT_ASSERT(session, ' +
+ l.name + '_size != 0);\n')
+ f.write('\t\tincr_mem += ' + l.name + '_size;\n')
+ f.write('\t} else\n')
+ f.write(
+ '\t\t__wt_free(session, args->' + l.name + ');\n')
+ f.write('''\tif (incr_mem != 0)
+\t\t__wt_cache_page_inmem_incr(session, page, incr_mem);
+
+''')
+
f.write('\treturn (ret);\n')
f.write('}\n\n')
@@ -146,15 +160,12 @@ typedef struct {
for l in entry.args:
if l.sized:
f.write('''
-static inline void\n__wt_''' + entry.name + '_' + l.name + '''_taken(
- WT_SESSION_IMPL *session, void *untyped_args, WT_PAGE *page)
+static inline void\n__wt_''' + entry.name + '_' + l.name +
+ '''_taken(void *untyped_args)
{
\t__wt_''' + entry.name + '''_args *args = (__wt_''' + entry.name + '''_args *)untyped_args;
\targs->''' + l.name + '''_taken = 1;
-
-\tWT_ASSERT(session, args->''' + l.name + '''_size != 0);
-\t__wt_cache_page_inmem_incr(session, page, args->''' + l.name + '''_size);
}
''')
diff --git a/examples/c/ex_access.c b/examples/c/ex_access.c
index 6d5411d6662..0b8f7493a5c 100644
--- a/examples/c/ex_access.c
+++ b/examples/c/ex_access.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2008-2012 WiredTiger, Inc.
+ * Public Domain 2008-2013 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
*
diff --git a/examples/c/ex_all.c b/examples/c/ex_all.c
index 262a7a659ff..a724dc29c01 100644
--- a/examples/c/ex_all.c
+++ b/examples/c/ex_all.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2008-2012 WiredTiger, Inc.
+ * Public Domain 2008-2013 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
*
diff --git a/examples/c/ex_call_center.c b/examples/c/ex_call_center.c
index 23fe3f12f0a..97c30662a92 100644
--- a/examples/c/ex_call_center.c
+++ b/examples/c/ex_call_center.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2008-2012 WiredTiger, Inc.
+ * Public Domain 2008-2013 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
*
diff --git a/examples/c/ex_config.c b/examples/c/ex_config.c
index a38c16b0e86..81c68150c22 100644
--- a/examples/c/ex_config.c
+++ b/examples/c/ex_config.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2008-2012 WiredTiger, Inc.
+ * Public Domain 2008-2013 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
*
diff --git a/examples/c/ex_cursor.c b/examples/c/ex_cursor.c
index 1f1ed859497..e46346887c3 100644
--- a/examples/c/ex_cursor.c
+++ b/examples/c/ex_cursor.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2008-2012 WiredTiger, Inc.
+ * Public Domain 2008-2013 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
*
diff --git a/examples/c/ex_extending.c b/examples/c/ex_extending.c
index 298900dd200..7d0b04aab7a 100644
--- a/examples/c/ex_extending.c
+++ b/examples/c/ex_extending.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2008-2012 WiredTiger, Inc.
+ * Public Domain 2008-2013 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
*
diff --git a/examples/c/ex_file.c b/examples/c/ex_file.c
index fc97313b99f..110c433f738 100644
--- a/examples/c/ex_file.c
+++ b/examples/c/ex_file.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2008-2012 WiredTiger, Inc.
+ * Public Domain 2008-2013 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
*
diff --git a/examples/c/ex_hello.c b/examples/c/ex_hello.c
index 617932af9a1..b7c8a2497f0 100644
--- a/examples/c/ex_hello.c
+++ b/examples/c/ex_hello.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2008-2012 WiredTiger, Inc.
+ * Public Domain 2008-2013 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
*
diff --git a/examples/c/ex_pack.c b/examples/c/ex_pack.c
index 08ac0de9e45..a277e1e6ed4 100644
--- a/examples/c/ex_pack.c
+++ b/examples/c/ex_pack.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2008-2012 WiredTiger, Inc.
+ * Public Domain 2008-2013 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
*
diff --git a/examples/c/ex_process.c b/examples/c/ex_process.c
index 4ff0d89253b..0894a7d1106 100644
--- a/examples/c/ex_process.c
+++ b/examples/c/ex_process.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2008-2012 WiredTiger, Inc.
+ * Public Domain 2008-2013 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
*
diff --git a/examples/c/ex_schema.c b/examples/c/ex_schema.c
index 1958f4e47d6..60a889a71be 100644
--- a/examples/c/ex_schema.c
+++ b/examples/c/ex_schema.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2008-2012 WiredTiger, Inc.
+ * Public Domain 2008-2013 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
*
diff --git a/examples/c/ex_stat.c b/examples/c/ex_stat.c
index 93a7a44e9f0..21fb2447ee1 100644
--- a/examples/c/ex_stat.c
+++ b/examples/c/ex_stat.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2008-2012 WiredTiger, Inc.
+ * Public Domain 2008-2013 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
*
diff --git a/examples/c/ex_thread.c b/examples/c/ex_thread.c
index 4d89d9c3a39..f4249f7e240 100644
--- a/examples/c/ex_thread.c
+++ b/examples/c/ex_thread.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2008-2012 WiredTiger, Inc.
+ * Public Domain 2008-2013 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
*
diff --git a/examples/python/ex_access.py b/examples/python/ex_access.py
index 587b2bc06e8..b10be91c7d9 100755
--- a/examples/python/ex_access.py
+++ b/examples/python/ex_access.py
@@ -1,4 +1,4 @@
-# Public Domain 2008-2012 WiredTiger, Inc.
+# Public Domain 2008-2013 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
#
diff --git a/ext/collators/reverse/reverse_collator.c b/ext/collators/reverse/reverse_collator.c
index dac0d4fcf63..36fe6940c9d 100644
--- a/ext/collators/reverse/reverse_collator.c
+++ b/ext/collators/reverse/reverse_collator.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2008-2012 WiredTiger, Inc.
+ * Public Domain 2008-2013 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
*
diff --git a/ext/compressors/bzip2/bzip2_compress.c b/ext/compressors/bzip2/bzip2_compress.c
index 5a328ab232a..b85abed13ae 100644
--- a/ext/compressors/bzip2/bzip2_compress.c
+++ b/ext/compressors/bzip2/bzip2_compress.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2008-2012 WiredTiger, Inc.
+ * Public Domain 2008-2013 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
*
diff --git a/ext/compressors/nop/nop_compress.c b/ext/compressors/nop/nop_compress.c
index a5aa7569b26..800aa26f2a7 100644
--- a/ext/compressors/nop/nop_compress.c
+++ b/ext/compressors/nop/nop_compress.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2008-2012 WiredTiger, Inc.
+ * Public Domain 2008-2013 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
*
diff --git a/ext/compressors/snappy/snappy_compress.c b/ext/compressors/snappy/snappy_compress.c
index 8833bdddfd7..e957e114166 100644
--- a/ext/compressors/snappy/snappy_compress.c
+++ b/ext/compressors/snappy/snappy_compress.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2008-2012 WiredTiger, Inc.
+ * Public Domain 2008-2013 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
*
diff --git a/lang/python/fpacking.py b/lang/python/fpacking.py
index adabcfa807e..1922047edde 100644
--- a/lang/python/fpacking.py
+++ b/lang/python/fpacking.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Copyright (c) 2008-2012 WiredTiger, Inc.
+# Copyright (c) 2008-2013 WiredTiger, Inc.
# All rights reserved.
#
# See the file LICENSE for redistribution information.
diff --git a/lang/python/intpack-test.py b/lang/python/intpack-test.py
index 02c5bf54701..78399a24deb 100644
--- a/lang/python/intpack-test.py
+++ b/lang/python/intpack-test.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Copyright (c) 2008-2012 WiredTiger, Inc.
+# Copyright (c) 2008-2013 WiredTiger, Inc.
# All rights reserved.
#
# See the file LICENSE for redistribution information.
diff --git a/lang/python/intpacking.py b/lang/python/intpacking.py
index 3c94c1e7416..e41b4ad9b3d 100644
--- a/lang/python/intpacking.py
+++ b/lang/python/intpacking.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Copyright (c) 2008-2012 WiredTiger, Inc.
+# Copyright (c) 2008-2013 WiredTiger, Inc.
# All rights reserved.
#
# See the file LICENSE for redistribution information.
diff --git a/lang/python/packing-test.py b/lang/python/packing-test.py
index 065e26e029b..ffbb049c8eb 100644
--- a/lang/python/packing-test.py
+++ b/lang/python/packing-test.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Copyright (c) 2008-2012 WiredTiger, Inc.
+# Copyright (c) 2008-2013 WiredTiger, Inc.
# All rights reserved.
#
# See the file LICENSE for redistribution information.
diff --git a/lang/python/packing.py b/lang/python/packing.py
index a642f70ba75..397207778cb 100644
--- a/lang/python/packing.py
+++ b/lang/python/packing.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Copyright (c) 2008-2012 WiredTiger, Inc.
+# Copyright (c) 2008-2013 WiredTiger, Inc.
# All rights reserved.
#
# See the file LICENSE for redistribution information.
diff --git a/lang/python/setup.py b/lang/python/setup.py
index 05600dd3353..995175d6ad2 100644
--- a/lang/python/setup.py
+++ b/lang/python/setup.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
#
-# Copyright (c) 2008-2012 WiredTiger, Inc.
-# All rights reserved.
+# Copyright (c) 2008-2013 WiredTiger, Inc.
+# All rights reserved.
#
# See the file LICENSE for redistribution information.
diff --git a/lang/python/src/server.py b/lang/python/src/server.py
index 6ec75ef8a24..73f75016342 100644
--- a/lang/python/src/server.py
+++ b/lang/python/src/server.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Copyright (c) 2008-2012 WiredTiger, Inc.
+# Copyright (c) 2008-2013 WiredTiger, Inc.
# All rights reserved.
#
# See the file LICENSE for redistribution information.
diff --git a/lang/python/src/wiredtiger/__init__.py b/lang/python/src/wiredtiger/__init__.py
index 149a95d5138..db7f2aefbc2 100644
--- a/lang/python/src/wiredtiger/__init__.py
+++ b/lang/python/src/wiredtiger/__init__.py
@@ -1,6 +1,6 @@
#
#
-# Copyright (c) 2008-2012 WiredTiger, Inc.
+# Copyright (c) 2008-2013 WiredTiger, Inc.
# All rights reserved.
#
# See the file LICENSE for redistribution information.
diff --git a/lang/python/src/wiredtiger/impl/__init__.py b/lang/python/src/wiredtiger/impl/__init__.py
index 2078d90a72c..20501c97063 100644
--- a/lang/python/src/wiredtiger/impl/__init__.py
+++ b/lang/python/src/wiredtiger/impl/__init__.py
@@ -1,6 +1,6 @@
#
#
-# Copyright (c) 2008-2012 WiredTiger, Inc.
+# Copyright (c) 2008-2013 WiredTiger, Inc.
# All rights reserved.
#
# See the file LICENSE for redistribution information.
diff --git a/lang/python/src/wiredtiger/util.py b/lang/python/src/wiredtiger/util.py
index b8e8f1d65a4..a992efe6901 100644
--- a/lang/python/src/wiredtiger/util.py
+++ b/lang/python/src/wiredtiger/util.py
@@ -1,6 +1,6 @@
#
#
-# Copyright (c) 2008-2012 WiredTiger, Inc.
+# Copyright (c) 2008-2013 WiredTiger, Inc.
# All rights reserved.
#
# See the file LICENSE for redistribution information.
diff --git a/lang/python/wiredtiger.i b/lang/python/wiredtiger.i
index 7372213cb77..a6a8ed532ae 100644
--- a/lang/python/wiredtiger.i
+++ b/lang/python/wiredtiger.i
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/api/api_version.c b/src/api/api_version.c
index e4bc3610d7a..5b5574e6641 100644
--- a/src/api/api_version.c
+++ b/src/api/api_version.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/block/block_addr.c b/src/block/block_addr.c
index 2e18e73ab46..37af46a7124 100644
--- a/src/block/block_addr.c
+++ b/src/block/block_addr.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/block/block_ckpt.c b/src/block/block_ckpt.c
index 887852132bd..6fe12f88bb7 100644
--- a/src/block/block_ckpt.c
+++ b/src/block/block_ckpt.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/block/block_compact.c b/src/block/block_compact.c
index 23055a68ebe..b5d631ab4c2 100644
--- a/src/block/block_compact.c
+++ b/src/block/block_compact.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/block/block_ext.c b/src/block/block_ext.c
index 2e226e7fef8..d082cb8b539 100644
--- a/src/block/block_ext.c
+++ b/src/block/block_ext.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/block/block_mgr.c b/src/block/block_mgr.c
index 8f65dcc3ab6..3cd5b391c3a 100644
--- a/src/block/block_mgr.c
+++ b/src/block/block_mgr.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/block/block_open.c b/src/block/block_open.c
index 2efdc6a8b23..63fcb968c74 100644
--- a/src/block/block_open.c
+++ b/src/block/block_open.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/block/block_read.c b/src/block/block_read.c
index ffe5a79bf4a..be458836d5b 100644
--- a/src/block/block_read.c
+++ b/src/block/block_read.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/block/block_slvg.c b/src/block/block_slvg.c
index 326df3c38cc..140da99a865 100644
--- a/src/block/block_slvg.c
+++ b/src/block/block_slvg.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/block/block_vrfy.c b/src/block/block_vrfy.c
index 980a4cb9547..8556a953171 100644
--- a/src/block/block_vrfy.c
+++ b/src/block/block_vrfy.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/block/block_write.c b/src/block/block_write.c
index 2f869e48f5a..cd35c9833d8 100644
--- a/src/block/block_write.c
+++ b/src/block/block_write.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/bloom/bloom.c b/src/bloom/bloom.c
index 8fa613b2ac9..0d710b15c47 100644
--- a/src/bloom/bloom.c
+++ b/src/bloom/bloom.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/btree/bt_bulk.c b/src/btree/bt_bulk.c
index bebec44d673..327fc721a04 100644
--- a/src/btree/bt_bulk.c
+++ b/src/btree/bt_bulk.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/btree/bt_compact.c b/src/btree/bt_compact.c
index faf271c0c03..c1156c90a44 100644
--- a/src/btree/bt_compact.c
+++ b/src/btree/bt_compact.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/btree/bt_curnext.c b/src/btree/bt_curnext.c
index 9367a8586fe..64fe1905608 100644
--- a/src/btree/bt_curnext.c
+++ b/src/btree/bt_curnext.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/btree/bt_curprev.c b/src/btree/bt_curprev.c
index 867e7d881b5..27e1b7d0982 100644
--- a/src/btree/bt_curprev.c
+++ b/src/btree/bt_curprev.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/btree/bt_cursor.c b/src/btree/bt_cursor.c
index 53f41a7bf6f..3954f576210 100644
--- a/src/btree/bt_cursor.c
+++ b/src/btree/bt_cursor.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/btree/bt_debug.c b/src/btree/bt_debug.c
index 90a10e1e37c..20a5f74632c 100644
--- a/src/btree/bt_debug.c
+++ b/src/btree/bt_debug.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/btree/bt_discard.c b/src/btree/bt_discard.c
index 7550285acbb..ea509c483bf 100644
--- a/src/btree/bt_discard.c
+++ b/src/btree/bt_discard.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/btree/bt_evict.c b/src/btree/bt_evict.c
index dcdff968ed2..6fa4ff67a3b 100644
--- a/src/btree/bt_evict.c
+++ b/src/btree/bt_evict.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
@@ -82,11 +82,11 @@ __evict_list_clr(WT_SESSION_IMPL *session, WT_EVICT_ENTRY *e)
}
/*
- * __evict_list_clr_all --
- * Clear all entries in the LRU eviction list.
+ * __evict_list_clr_range --
+ * Clear entries in the LRU eviction list, from a lower-bound to the end.
*/
static inline void
-__evict_list_clr_all(WT_SESSION_IMPL *session, u_int start)
+__evict_list_clr_range(WT_SESSION_IMPL *session, u_int start)
{
WT_CACHE *cache;
WT_EVICT_ENTRY *evict;
@@ -471,7 +471,7 @@ __evict_file_request_walk(WT_SESSION_IMPL *session)
* The eviction candidate list might reference pages we are
* about to discard; clear it.
*/
- __evict_list_clr_all(session, 0);
+ __evict_list_clr_range(session, 0);
/*
* Wait for LRU eviction activity to drain. We are discarding or
@@ -722,7 +722,7 @@ __evict_lru(WT_SESSION_IMPL *session, uint32_t flags)
break;
cache->evict_candidates = i + 1;
- __evict_list_clr_all(session, WT_EVICT_WALK_BASE);
+ __evict_list_clr_range(session, WT_EVICT_WALK_BASE);
cache->evict_current = cache->evict;
__wt_spin_unlock(session, &cache->evict_lock);
diff --git a/src/btree/bt_handle.c b/src/btree/bt_handle.c
index 9a29f4966c0..8d613140dd2 100644
--- a/src/btree/bt_handle.c
+++ b/src/btree/bt_handle.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/btree/bt_huffman.c b/src/btree/bt_huffman.c
index a5b65d61506..25e760e2e99 100644
--- a/src/btree/bt_huffman.c
+++ b/src/btree/bt_huffman.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/btree/bt_io.c b/src/btree/bt_io.c
index 147f292e31d..d04e127ca0c 100644
--- a/src/btree/bt_io.c
+++ b/src/btree/bt_io.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/btree/bt_misc.c b/src/btree/bt_misc.c
index cc862303236..dff902193b4 100644
--- a/src/btree/bt_misc.c
+++ b/src/btree/bt_misc.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/btree/bt_ovfl.c b/src/btree/bt_ovfl.c
index d01eabfbc33..345ed82ada9 100644
--- a/src/btree/bt_ovfl.c
+++ b/src/btree/bt_ovfl.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/btree/bt_page.c b/src/btree/bt_page.c
index 8bea1220d64..0f63b11b7a2 100644
--- a/src/btree/bt_page.c
+++ b/src/btree/bt_page.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/btree/bt_read.c b/src/btree/bt_read.c
index f226408bb12..e85f2613aff 100644
--- a/src/btree/bt_read.c
+++ b/src/btree/bt_read.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/btree/bt_ret.c b/src/btree/bt_ret.c
index 0562309b395..e600cdbf4fd 100644
--- a/src/btree/bt_ret.c
+++ b/src/btree/bt_ret.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/btree/bt_slvg.c b/src/btree/bt_slvg.c
index 2d917407366..08c49332507 100644
--- a/src/btree/bt_slvg.c
+++ b/src/btree/bt_slvg.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/btree/bt_stat.c b/src/btree/bt_stat.c
index dcf0db596a2..f5ed34b2b82 100644
--- a/src/btree/bt_stat.c
+++ b/src/btree/bt_stat.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/btree/bt_sync.c b/src/btree/bt_sync.c
index 1887ca1a9e3..3ef8e57af26 100644
--- a/src/btree/bt_sync.c
+++ b/src/btree/bt_sync.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/btree/bt_upgrade.c b/src/btree/bt_upgrade.c
index fb675123d13..3244c1cac72 100644
--- a/src/btree/bt_upgrade.c
+++ b/src/btree/bt_upgrade.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/btree/bt_vrfy.c b/src/btree/bt_vrfy.c
index da5dba546dd..d4b4637b0d5 100644
--- a/src/btree/bt_vrfy.c
+++ b/src/btree/bt_vrfy.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/btree/bt_vrfy_dsk.c b/src/btree/bt_vrfy_dsk.c
index 39036e62c5e..cce839feaba 100644
--- a/src/btree/bt_vrfy_dsk.c
+++ b/src/btree/bt_vrfy_dsk.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/btree/bt_walk.c b/src/btree/bt_walk.c
index 8c494b96e68..1b4a1d7c2fa 100644
--- a/src/btree/bt_walk.c
+++ b/src/btree/bt_walk.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
@@ -74,6 +74,16 @@ __tree_walk_delete(
return (0);
/*
+ * We may be in a reconciliation-built internal page if the page split.
+ * In that case, the reference address doesn't point to a cell. While
+ * we could probably still fast-delete the page, I doubt it's a common
+ * enough case to make it worth the effort. Skip fast deletes inside
+ * split merge pages.
+ */
+ if (__wt_off_page(page, ref->addr))
+ goto err;
+
+ /*
* If the page references overflow items, we have to clean it up during
* reconciliation, no fast delete. Check this after we have the page
* locked down, instantiating the page in memory and modifying it could
diff --git a/src/btree/col_modify.c b/src/btree/col_modify.c
index fdefc1b456c..92c4a05be56 100644
--- a/src/btree/col_modify.c
+++ b/src/btree/col_modify.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
@@ -286,7 +286,7 @@ __wt_col_append_serial_func(WT_SESSION_IMPL *session, void *args)
*ins_stack[i] = new_ins;
}
- __wt_col_append_new_ins_taken(session, args, page);
+ __wt_col_append_new_ins_taken(args);
/*
* If the insert head does not yet have an insert list, our caller
@@ -297,7 +297,7 @@ __wt_col_append_serial_func(WT_SESSION_IMPL *session, void *args)
*/
if (*insheadp == NULL) {
WT_PUBLISH(*insheadp, new_inshead);
- __wt_col_append_new_inshead_taken(session, args, page);
+ __wt_col_append_new_inshead_taken(args);
}
/*
@@ -309,7 +309,7 @@ __wt_col_append_serial_func(WT_SESSION_IMPL *session, void *args)
*/
if (page->modify->append == NULL) {
page->modify->append = new_inslist;
- __wt_col_append_new_inslist_taken(session, args, page);
+ __wt_col_append_new_inslist_taken(args);
}
/*
diff --git a/src/btree/col_srch.c b/src/btree/col_srch.c
index fd7e89eeb47..2219561d6d2 100644
--- a/src/btree/col_srch.c
+++ b/src/btree/col_srch.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/btree/rec_evict.c b/src/btree/rec_evict.c
index 57e70d3ec42..b73a3be1439 100644
--- a/src/btree/rec_evict.c
+++ b/src/btree/rec_evict.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/btree/rec_track.c b/src/btree/rec_track.c
index 08943327cce..21dffba7dc7 100644
--- a/src/btree/rec_track.c
+++ b/src/btree/rec_track.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/btree/rec_write.c b/src/btree/rec_write.c
index 609ecf95826..23c8a3a3d55 100644
--- a/src/btree/rec_write.c
+++ b/src/btree/rec_write.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/btree/row_key.c b/src/btree/row_key.c
index 854f76284ea..4f7863a7aac 100644
--- a/src/btree/row_key.c
+++ b/src/btree/row_key.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/btree/row_modify.c b/src/btree/row_modify.c
index d56a9dde57f..2935a7f56ae 100644
--- a/src/btree/row_modify.c
+++ b/src/btree/row_modify.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
@@ -256,7 +256,7 @@ __wt_insert_serial_func(WT_SESSION_IMPL *session, void *args)
*ins_stack[i] = new_ins;
}
- __wt_insert_new_ins_taken(session, args, page);
+ __wt_insert_new_ins_taken(args);
/*
* If the insert head does not yet have an insert list, our caller
@@ -267,7 +267,7 @@ __wt_insert_serial_func(WT_SESSION_IMPL *session, void *args)
*/
if (*insheadp == NULL) {
WT_PUBLISH(*insheadp, new_inshead);
- __wt_insert_new_inshead_taken(session, args, page);
+ __wt_insert_new_inshead_taken(args);
}
/*
@@ -280,12 +280,12 @@ __wt_insert_serial_func(WT_SESSION_IMPL *session, void *args)
if (page->type == WT_PAGE_ROW_LEAF) {
if (page->u.row.ins == NULL) {
page->u.row.ins = new_inslist;
- __wt_insert_new_inslist_taken(session, args, page);
+ __wt_insert_new_inslist_taken(args);
}
} else
if (page->modify->update == NULL) {
page->modify->update = new_inslist;
- __wt_insert_new_inslist_taken(session, args, page);
+ __wt_insert_new_inslist_taken(args);
}
__wt_page_and_tree_modify_set(session, page);
return (0);
@@ -476,7 +476,7 @@ __wt_update_serial_func(WT_SESSION_IMPL *session, void *args)
* pointer is set before we update the linked list.
*/
WT_PUBLISH(*upd_entry, upd);
- __wt_update_upd_taken(session, args, page);
+ __wt_update_upd_taken(args);
/*
* If the page needs an update array (column-store pages and inserts on
@@ -489,7 +489,7 @@ __wt_update_serial_func(WT_SESSION_IMPL *session, void *args)
*/
if (new_upd != NULL && page->u.row.upd == NULL) {
page->u.row.upd = new_upd;
- __wt_update_new_upd_taken(session, args, page);
+ __wt_update_new_upd_taken(args);
}
/* Discard obsolete WT_UPDATE structures. */
diff --git a/src/btree/row_srch.c b/src/btree/row_srch.c
index cf100e5f6a4..8e03c0ed72d 100644
--- a/src/btree/row_srch.c
+++ b/src/btree/row_srch.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/config/config.c b/src/config/config.c
index 895a6a3bf34..141a969895b 100644
--- a/src/config/config.c
+++ b/src/config/config.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/config/config_check.c b/src/config/config_check.c
index d0b8f39751c..9f4628611dd 100644
--- a/src/config/config_check.c
+++ b/src/config/config_check.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/config/config_collapse.c b/src/config/config_collapse.c
index 003a857862a..12c3015f934 100644
--- a/src/config/config_collapse.c
+++ b/src/config/config_collapse.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/config/config_concat.c b/src/config/config_concat.c
index 8dcc79c741a..7d79e921ebc 100644
--- a/src/config/config_concat.c
+++ b/src/config/config_concat.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/conn/conn_api.c b/src/conn/conn_api.c
index 374bca71b26..057d1cba2e9 100644
--- a/src/conn/conn_api.c
+++ b/src/conn/conn_api.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/conn/conn_btree.c b/src/conn/conn_btree.c
index b32416caae8..ad2b016a254 100644
--- a/src/conn/conn_btree.c
+++ b/src/conn/conn_btree.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/conn/conn_cache.c b/src/conn/conn_cache.c
index ae1600dfcc9..f51c1695049 100644
--- a/src/conn/conn_cache.c
+++ b/src/conn/conn_cache.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/conn/conn_cache_pool.c b/src/conn/conn_cache_pool.c
index b4f16557142..d9bc11d4952 100644
--- a/src/conn/conn_cache_pool.c
+++ b/src/conn/conn_cache_pool.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/conn/conn_handle.c b/src/conn/conn_handle.c
index ef698f335be..97cb533182d 100644
--- a/src/conn/conn_handle.c
+++ b/src/conn/conn_handle.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/conn/conn_open.c b/src/conn/conn_open.c
index 27b85cefa56..ae5d0d24172 100644
--- a/src/conn/conn_open.c
+++ b/src/conn/conn_open.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/conn/conn_stat.c b/src/conn/conn_stat.c
index 812a575b739..6ca3be4659a 100644
--- a/src/conn/conn_stat.c
+++ b/src/conn/conn_stat.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/cursor/cur_backup.c b/src/cursor/cur_backup.c
index 8dc5adb580a..f48676c70ff 100644
--- a/src/cursor/cur_backup.c
+++ b/src/cursor/cur_backup.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/cursor/cur_bulk.c b/src/cursor/cur_bulk.c
index ac9dc9a7b51..13c7b694e9a 100644
--- a/src/cursor/cur_bulk.c
+++ b/src/cursor/cur_bulk.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/cursor/cur_config.c b/src/cursor/cur_config.c
index 5dd91d33c16..a0173f0671e 100644
--- a/src/cursor/cur_config.c
+++ b/src/cursor/cur_config.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/cursor/cur_dump.c b/src/cursor/cur_dump.c
index 52265c2a5a9..8594ca20bc0 100644
--- a/src/cursor/cur_dump.c
+++ b/src/cursor/cur_dump.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/cursor/cur_file.c b/src/cursor/cur_file.c
index 0e2e9225e51..14593742210 100644
--- a/src/cursor/cur_file.c
+++ b/src/cursor/cur_file.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/cursor/cur_index.c b/src/cursor/cur_index.c
index b48b47336cd..2bdd57dcfab 100644
--- a/src/cursor/cur_index.c
+++ b/src/cursor/cur_index.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/cursor/cur_stat.c b/src/cursor/cur_stat.c
index 4f400cfdf7d..71eeea4361f 100644
--- a/src/cursor/cur_stat.c
+++ b/src/cursor/cur_stat.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/cursor/cur_std.c b/src/cursor/cur_std.c
index f5bdbf11027..0d335dbf83b 100644
--- a/src/cursor/cur_std.c
+++ b/src/cursor/cur_std.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/cursor/cur_table.c b/src/cursor/cur_table.c
index c47c8a88f2f..29b4529492b 100644
--- a/src/cursor/cur_table.c
+++ b/src/cursor/cur_table.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/docs/build-javadoc.sh b/src/docs/build-javadoc.sh
index c413db28d33..292c3468f4c 100755
--- a/src/docs/build-javadoc.sh
+++ b/src/docs/build-javadoc.sh
@@ -8,5 +8,5 @@ CLASSPATH=$THRIFT_HOME/libthrift.jar:$SLF4J_JAR javadoc -public -d $DOCS/java \
-stylesheetfile $DOCS/style/javadoc.css \
-use -link http://java.sun.com/j2se/1.5.0/docs/api/ \
-header '<b>WiredTiger API</b><br><font size="-1"> version '$WT_VERSION'</font>' \
- -windowtitle 'WiredTiger Java API' -bottom '<font size=1>Copyright (c) 2008-2012 WiredTiger, Inc. All rights reserved.</font>' \
+ -windowtitle 'WiredTiger Java API' -bottom '<font size=1>Copyright (c) 2008-2013 WiredTiger, Inc. All rights reserved.</font>' \
com.wiredtiger com.wiredtiger.util
diff --git a/src/docs/style/footer.html b/src/docs/style/footer.html
index 1f1084b9863..1c0f056a6a3 100644
--- a/src/docs/style/footer.html
+++ b/src/docs/style/footer.html
@@ -3,13 +3,13 @@
<div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
<ul>
$navpath
- <li class="footer">Copyright (c) 2008-2012 WiredTiger, Inc. All rights reserved. Contact <a href="mailto:info@wiredtiger.com">info@wiredtiger.com</a> for more information.</li>
+ <li class="footer">Copyright (c) 2008-2013 WiredTiger, Inc. All rights reserved. Contact <a href="mailto:info@wiredtiger.com">info@wiredtiger.com</a> for more information.</li>
</ul>
</div>
<!--END GENERATE_TREEVIEW-->
<!--BEGIN !GENERATE_TREEVIEW-->
<hr class="footer"/><address class="footer"><small>
-Copyright (c) 2008-2012 WiredTiger. All rights reserved. Contact <a href="mailto:info@wiredtiger.com">info@wiredtiger.com</a> for more information.
+Copyright (c) 2008-2013 WiredTiger. All rights reserved. Contact <a href="mailto:info@wiredtiger.com">info@wiredtiger.com</a> for more information.
</small></address>
<!--END !GENERATE_TREEVIEW-->
</body>
diff --git a/src/docs/tools/fixlinks.py b/src/docs/tools/fixlinks.py
index 075a0ef9401..c2cd564b446 100755
--- a/src/docs/tools/fixlinks.py
+++ b/src/docs/tools/fixlinks.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2008-2012 WiredTiger, Inc.
+# Public Domain 2008-2013 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
#
diff --git a/src/include/api.h b/src/include/api.h
index 54baf37351c..d6a4d0d7717 100644
--- a/src/include/api.h
+++ b/src/include/api.h
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/include/bitstring.i b/src/include/bitstring.i
index 42bb73605a2..70f77e91d13 100644
--- a/src/include/bitstring.i
+++ b/src/include/bitstring.i
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2008-2012 WiredTiger, Inc.
+ * Public Domain 2008-2013 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
*
diff --git a/src/include/block.h b/src/include/block.h
index 327e922c2ec..788f9769066 100644
--- a/src/include/block.h
+++ b/src/include/block.h
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/include/bloom.h b/src/include/bloom.h
index b2b4791c968..17727acb482 100644
--- a/src/include/bloom.h
+++ b/src/include/bloom.h
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/include/btmem.h b/src/include/btmem.h
index fc8d14dff2d..9d8b260de50 100644
--- a/src/include/btmem.h
+++ b/src/include/btmem.h
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/include/btree.h b/src/include/btree.h
index f42e331ca97..7caf0c5839c 100644
--- a/src/include/btree.h
+++ b/src/include/btree.h
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/include/btree.i b/src/include/btree.i
index 167b0bd0607..b0041ff708b 100644
--- a/src/include/btree.i
+++ b/src/include/btree.i
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/include/cache.h b/src/include/cache.h
index a70721a5a09..9f827ab0658 100644
--- a/src/include/cache.h
+++ b/src/include/cache.h
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/include/cache.i b/src/include/cache.i
index 73ffe1a4dba..dd5e031ac6d 100644
--- a/src/include/cache.i
+++ b/src/include/cache.i
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/include/cell.i b/src/include/cell.i
index 7449d6543ab..326e5ade2cf 100644
--- a/src/include/cell.i
+++ b/src/include/cell.i
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/include/column.i b/src/include/column.i
index 0cf83a6d2e9..ca98708c21b 100644
--- a/src/include/column.i
+++ b/src/include/column.i
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/include/config.h b/src/include/config.h
index 0bd6232c576..7d5e64e715a 100644
--- a/src/include/config.h
+++ b/src/include/config.h
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/include/connection.h b/src/include/connection.h
index e250ea6da58..c3d4dd22445 100644
--- a/src/include/connection.h
+++ b/src/include/connection.h
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/include/cursor.h b/src/include/cursor.h
index e11775db615..ac4ec984629 100644
--- a/src/include/cursor.h
+++ b/src/include/cursor.h
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/include/cursor.i b/src/include/cursor.i
index 8436162be46..5bdd82325e7 100644
--- a/src/include/cursor.i
+++ b/src/include/cursor.i
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/include/dlh.h b/src/include/dlh.h
index 6c3aba944b2..7f9433e17c9 100644
--- a/src/include/dlh.h
+++ b/src/include/dlh.h
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/include/error.h b/src/include/error.h
index 70b20e32c44..3cd44f5b6c8 100644
--- a/src/include/error.h
+++ b/src/include/error.h
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/include/intpack.i b/src/include/intpack.i
index 7d56bdedd48..39c4d68cb2d 100644
--- a/src/include/intpack.i
+++ b/src/include/intpack.i
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/include/log.h b/src/include/log.h
index d1ef702fb74..53c1a4fc8d1 100644
--- a/src/include/log.h
+++ b/src/include/log.h
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/include/lsm.h b/src/include/lsm.h
index 8cc671a7fd3..396363e9e44 100644
--- a/src/include/lsm.h
+++ b/src/include/lsm.h
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/include/meta.h b/src/include/meta.h
index b2a9541d4c0..3c1e7ae1a7e 100644
--- a/src/include/meta.h
+++ b/src/include/meta.h
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/include/misc.h b/src/include/misc.h
index b422ad65d7a..41fe197ef06 100644
--- a/src/include/misc.h
+++ b/src/include/misc.h
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/include/mutex.h b/src/include/mutex.h
index 9f05d14680a..b33c3b5b8a2 100644
--- a/src/include/mutex.h
+++ b/src/include/mutex.h
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/include/mutex.i b/src/include/mutex.i
index aa0b59cc8d0..48f7cc1cb4b 100644
--- a/src/include/mutex.i
+++ b/src/include/mutex.i
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/include/os.h b/src/include/os.h
index 6e925d6923d..f56fb939c43 100644
--- a/src/include/os.h
+++ b/src/include/os.h
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/include/packing.i b/src/include/packing.i
index 10bb0482593..b5f50ebf56e 100644
--- a/src/include/packing.i
+++ b/src/include/packing.i
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/include/posix.h b/src/include/posix.h
index db6327e84f2..c1068152d77 100644
--- a/src/include/posix.h
+++ b/src/include/posix.h
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/include/schema.h b/src/include/schema.h
index 7bbbff76047..8312ec72836 100644
--- a/src/include/schema.h
+++ b/src/include/schema.h
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/include/serial_funcs.i b/src/include/serial_funcs.i
index 237e0807aeb..b3cb82f6d48 100644
--- a/src/include/serial_funcs.i
+++ b/src/include/serial_funcs.i
@@ -7,13 +7,10 @@ typedef struct {
WT_INSERT ***ins_stack;
WT_INSERT **next_stack;
WT_INSERT_HEAD **new_inslist;
- size_t new_inslist_size;
int new_inslist_taken;
WT_INSERT_HEAD *new_inshead;
- size_t new_inshead_size;
int new_inshead_taken;
WT_INSERT *new_ins;
- size_t new_ins_size;
int new_ins_taken;
u_int skipdepth;
} __wt_col_append_args;
@@ -24,10 +21,10 @@ __wt_col_append_serial(
WT_INSERT_HEAD **insheadp, WT_INSERT ***ins_stack, WT_INSERT
**next_stack, WT_INSERT_HEAD ***new_inslistp, size_t new_inslist_size,
WT_INSERT_HEAD **new_insheadp, size_t new_inshead_size, WT_INSERT
- **new_insp, size_t new_ins_size, u_int skipdepth)
-{
+ **new_insp, size_t new_ins_size, u_int skipdepth) {
__wt_col_append_args _args, *args = &_args;
WT_DECL_RET;
+ size_t incr_mem;
args->page = page;
@@ -44,7 +41,6 @@ __wt_col_append_serial(
else {
args->new_inslist = *new_inslistp;
*new_inslistp = NULL;
- args->new_inslist_size = new_inslist_size;
}
args->new_inslist_taken = 0;
@@ -53,7 +49,6 @@ __wt_col_append_serial(
else {
args->new_inshead = *new_insheadp;
*new_insheadp = NULL;
- args->new_inshead_size = new_inshead_size;
}
args->new_inshead_taken = 0;
@@ -62,7 +57,6 @@ __wt_col_append_serial(
else {
args->new_ins = *new_insp;
*new_insp = NULL;
- args->new_ins_size = new_ins_size;
}
args->new_ins_taken = 0;
@@ -72,12 +66,25 @@ __wt_col_append_serial(
ret = __wt_col_append_serial_func(session, args);
__wt_spin_unlock(session, &S2C(session)->serial_lock);
- if (!args->new_inslist_taken)
+ incr_mem = 0;
+ if (args->new_inslist_taken) {
+ WT_ASSERT(session, new_inslist_size != 0);
+ incr_mem += new_inslist_size;
+ } else
__wt_free(session, args->new_inslist);
- if (!args->new_inshead_taken)
+ if (args->new_inshead_taken) {
+ WT_ASSERT(session, new_inshead_size != 0);
+ incr_mem += new_inshead_size;
+ } else
__wt_free(session, args->new_inshead);
- if (!args->new_ins_taken)
+ if (args->new_ins_taken) {
+ WT_ASSERT(session, new_ins_size != 0);
+ incr_mem += new_ins_size;
+ } else
__wt_free(session, args->new_ins);
+ if (incr_mem != 0)
+ __wt_cache_page_inmem_incr(session, page, incr_mem);
+
return (ret);
}
@@ -102,39 +109,27 @@ __wt_col_append_unpack(
}
static inline void
-__wt_col_append_new_inslist_taken(
- WT_SESSION_IMPL *session, void *untyped_args, WT_PAGE *page)
+__wt_col_append_new_inslist_taken(void *untyped_args)
{
__wt_col_append_args *args = (__wt_col_append_args *)untyped_args;
args->new_inslist_taken = 1;
-
- WT_ASSERT(session, args->new_inslist_size != 0);
- __wt_cache_page_inmem_incr(session, page, args->new_inslist_size);
}
static inline void
-__wt_col_append_new_inshead_taken(
- WT_SESSION_IMPL *session, void *untyped_args, WT_PAGE *page)
+__wt_col_append_new_inshead_taken(void *untyped_args)
{
__wt_col_append_args *args = (__wt_col_append_args *)untyped_args;
args->new_inshead_taken = 1;
-
- WT_ASSERT(session, args->new_inshead_size != 0);
- __wt_cache_page_inmem_incr(session, page, args->new_inshead_size);
}
static inline void
-__wt_col_append_new_ins_taken(
- WT_SESSION_IMPL *session, void *untyped_args, WT_PAGE *page)
+__wt_col_append_new_ins_taken(void *untyped_args)
{
__wt_col_append_args *args = (__wt_col_append_args *)untyped_args;
args->new_ins_taken = 1;
-
- WT_ASSERT(session, args->new_ins_size != 0);
- __wt_cache_page_inmem_incr(session, page, args->new_ins_size);
}
typedef struct {
@@ -144,13 +139,10 @@ typedef struct {
WT_INSERT ***ins_stack;
WT_INSERT **next_stack;
WT_INSERT_HEAD **new_inslist;
- size_t new_inslist_size;
int new_inslist_taken;
WT_INSERT_HEAD *new_inshead;
- size_t new_inshead_size;
int new_inshead_taken;
WT_INSERT *new_ins;
- size_t new_ins_size;
int new_ins_taken;
u_int skipdepth;
} __wt_insert_args;
@@ -161,10 +153,10 @@ __wt_insert_serial(
WT_INSERT_HEAD **inshead, WT_INSERT ***ins_stack, WT_INSERT
**next_stack, WT_INSERT_HEAD ***new_inslistp, size_t new_inslist_size,
WT_INSERT_HEAD **new_insheadp, size_t new_inshead_size, WT_INSERT
- **new_insp, size_t new_ins_size, u_int skipdepth)
-{
+ **new_insp, size_t new_ins_size, u_int skipdepth) {
__wt_insert_args _args, *args = &_args;
WT_DECL_RET;
+ size_t incr_mem;
args->page = page;
@@ -181,7 +173,6 @@ __wt_insert_serial(
else {
args->new_inslist = *new_inslistp;
*new_inslistp = NULL;
- args->new_inslist_size = new_inslist_size;
}
args->new_inslist_taken = 0;
@@ -190,7 +181,6 @@ __wt_insert_serial(
else {
args->new_inshead = *new_insheadp;
*new_insheadp = NULL;
- args->new_inshead_size = new_inshead_size;
}
args->new_inshead_taken = 0;
@@ -199,7 +189,6 @@ __wt_insert_serial(
else {
args->new_ins = *new_insp;
*new_insp = NULL;
- args->new_ins_size = new_ins_size;
}
args->new_ins_taken = 0;
@@ -209,12 +198,25 @@ __wt_insert_serial(
ret = __wt_insert_serial_func(session, args);
__wt_spin_unlock(session, &S2C(session)->serial_lock);
- if (!args->new_inslist_taken)
+ incr_mem = 0;
+ if (args->new_inslist_taken) {
+ WT_ASSERT(session, new_inslist_size != 0);
+ incr_mem += new_inslist_size;
+ } else
__wt_free(session, args->new_inslist);
- if (!args->new_inshead_taken)
+ if (args->new_inshead_taken) {
+ WT_ASSERT(session, new_inshead_size != 0);
+ incr_mem += new_inshead_size;
+ } else
__wt_free(session, args->new_inshead);
- if (!args->new_ins_taken)
+ if (args->new_ins_taken) {
+ WT_ASSERT(session, new_ins_size != 0);
+ incr_mem += new_ins_size;
+ } else
__wt_free(session, args->new_ins);
+ if (incr_mem != 0)
+ __wt_cache_page_inmem_incr(session, page, incr_mem);
+
return (ret);
}
@@ -239,39 +241,27 @@ __wt_insert_unpack(
}
static inline void
-__wt_insert_new_inslist_taken(
- WT_SESSION_IMPL *session, void *untyped_args, WT_PAGE *page)
+__wt_insert_new_inslist_taken(void *untyped_args)
{
__wt_insert_args *args = (__wt_insert_args *)untyped_args;
args->new_inslist_taken = 1;
-
- WT_ASSERT(session, args->new_inslist_size != 0);
- __wt_cache_page_inmem_incr(session, page, args->new_inslist_size);
}
static inline void
-__wt_insert_new_inshead_taken(
- WT_SESSION_IMPL *session, void *untyped_args, WT_PAGE *page)
+__wt_insert_new_inshead_taken(void *untyped_args)
{
__wt_insert_args *args = (__wt_insert_args *)untyped_args;
args->new_inshead_taken = 1;
-
- WT_ASSERT(session, args->new_inshead_size != 0);
- __wt_cache_page_inmem_incr(session, page, args->new_inshead_size);
}
static inline void
-__wt_insert_new_ins_taken(
- WT_SESSION_IMPL *session, void *untyped_args, WT_PAGE *page)
+__wt_insert_new_ins_taken(void *untyped_args)
{
__wt_insert_args *args = (__wt_insert_args *)untyped_args;
args->new_ins_taken = 1;
-
- WT_ASSERT(session, args->new_ins_size != 0);
- __wt_cache_page_inmem_incr(session, page, args->new_ins_size);
}
typedef struct {
@@ -280,8 +270,7 @@ typedef struct {
static inline int
__wt_sync_file_serial(
- WT_SESSION_IMPL *session, int syncop)
-{
+ WT_SESSION_IMPL *session, int syncop) {
__wt_sync_file_args _args, *args = &_args;
WT_DECL_RET;
@@ -309,10 +298,8 @@ typedef struct {
WT_UPDATE **srch_upd;
WT_UPDATE *old_upd;
WT_UPDATE **new_upd;
- size_t new_upd_size;
int new_upd_taken;
WT_UPDATE *upd;
- size_t upd_size;
int upd_taken;
WT_UPDATE **upd_obsolete;
} __wt_update_args;
@@ -322,10 +309,10 @@ __wt_update_serial(
WT_SESSION_IMPL *session, WT_PAGE *page, uint32_t write_gen, WT_UPDATE
**srch_upd, WT_UPDATE *old_upd, WT_UPDATE ***new_updp, size_t
new_upd_size, WT_UPDATE **updp, size_t upd_size, WT_UPDATE
- **upd_obsolete)
-{
+ **upd_obsolete) {
__wt_update_args _args, *args = &_args;
WT_DECL_RET;
+ size_t incr_mem;
args->page = page;
@@ -340,7 +327,6 @@ __wt_update_serial(
else {
args->new_upd = *new_updp;
*new_updp = NULL;
- args->new_upd_size = new_upd_size;
}
args->new_upd_taken = 0;
@@ -349,7 +335,6 @@ __wt_update_serial(
else {
args->upd = *updp;
*updp = NULL;
- args->upd_size = upd_size;
}
args->upd_taken = 0;
@@ -359,10 +344,20 @@ __wt_update_serial(
ret = __wt_update_serial_func(session, args);
__wt_spin_unlock(session, &S2C(session)->serial_lock);
- if (!args->new_upd_taken)
+ incr_mem = 0;
+ if (args->new_upd_taken) {
+ WT_ASSERT(session, new_upd_size != 0);
+ incr_mem += new_upd_size;
+ } else
__wt_free(session, args->new_upd);
- if (!args->upd_taken)
+ if (args->upd_taken) {
+ WT_ASSERT(session, upd_size != 0);
+ incr_mem += upd_size;
+ } else
__wt_free(session, args->upd);
+ if (incr_mem != 0)
+ __wt_cache_page_inmem_incr(session, page, incr_mem);
+
return (ret);
}
@@ -384,25 +379,17 @@ __wt_update_unpack(
}
static inline void
-__wt_update_new_upd_taken(
- WT_SESSION_IMPL *session, void *untyped_args, WT_PAGE *page)
+__wt_update_new_upd_taken(void *untyped_args)
{
__wt_update_args *args = (__wt_update_args *)untyped_args;
args->new_upd_taken = 1;
-
- WT_ASSERT(session, args->new_upd_size != 0);
- __wt_cache_page_inmem_incr(session, page, args->new_upd_size);
}
static inline void
-__wt_update_upd_taken(
- WT_SESSION_IMPL *session, void *untyped_args, WT_PAGE *page)
+__wt_update_upd_taken(void *untyped_args)
{
__wt_update_args *args = (__wt_update_args *)untyped_args;
args->upd_taken = 1;
-
- WT_ASSERT(session, args->upd_size != 0);
- __wt_cache_page_inmem_incr(session, page, args->upd_size);
}
diff --git a/src/include/session.h b/src/include/session.h
index 0031255b60d..ba5935fbe82 100644
--- a/src/include/session.h
+++ b/src/include/session.h
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/include/stat.h b/src/include/stat.h
index 7983e6615cf..ab03363491b 100644
--- a/src/include/stat.h
+++ b/src/include/stat.h
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/include/txn.h b/src/include/txn.h
index ed85867a74a..d4e44f9aeac 100644
--- a/src/include/txn.h
+++ b/src/include/txn.h
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/include/txn.i b/src/include/txn.i
index 0aa8f318906..c37a58a8f04 100644
--- a/src/include/txn.i
+++ b/src/include/txn.i
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/include/verify_build.h b/src/include/verify_build.h
index c1a22f63b29..d826e4e6907 100644
--- a/src/include/verify_build.h
+++ b/src/include/verify_build.h
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/include/wiredtiger.in b/src/include/wiredtiger.in
index 2bb2144697c..ed2b484f9a0 100644
--- a/src/include/wiredtiger.in
+++ b/src/include/wiredtiger.in
@@ -1043,8 +1043,9 @@ struct __wt_connection {
* 10MB and 10TB; default \c 50MB.}@config{&nbsp;&nbsp;&nbsp;&nbsp;name,
* name of a cache that is shared between databases.,a string; default
* empty.}@config{&nbsp;&nbsp;&nbsp;&nbsp;size, maximum memory to
- * allocate for the shared cache.,an integer between 1MB and 10TB;
- * default \c 500MB.}@config{ ),,}
+ * allocate for the shared cache. Setting this will update the value if
+ * one is already set.,an integer between 1MB and 10TB; default \c
+ * 500MB.}@config{ ),,}
* @config{verbose, enable messages for various events. Options are
* given as a list\, such as
* <code>"verbose=[evictserver\,read]"</code>.,a list\, with values
@@ -1252,8 +1253,8 @@ struct __wt_connection {
* 50MB.}@config{&nbsp;&nbsp;&nbsp;&nbsp;name, name of a cache that is shared
* between databases.,a string; default
* empty.}@config{&nbsp;&nbsp;&nbsp;&nbsp;size, maximum memory to allocate for
- * the shared cache.,an integer between 1MB and 10TB; default \c 500MB.}@config{
- * ),,}
+ * the shared cache. Setting this will update the value if one is already
+ * set.,an integer between 1MB and 10TB; default \c 500MB.}@config{ ),,}
* @config{sync, flush files to stable storage when closing or writing
* checkpoints.,a boolean flag; default \c true.}
* @config{transactional, support transactional semantics.,a boolean flag;
diff --git a/src/include/wiredtiger_ext.h b/src/include/wiredtiger_ext.h
index 856c5b84483..333eeb6f912 100644
--- a/src/include/wiredtiger_ext.h
+++ b/src/include/wiredtiger_ext.h
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/include/wt_internal.h b/src/include/wt_internal.h
index 204e0ce27e0..8b9639a1073 100644
--- a/src/include/wt_internal.h
+++ b/src/include/wt_internal.h
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/log/log.c b/src/log/log.c
index 0f9adb9610a..ddc9a07d126 100644
--- a/src/log/log.c
+++ b/src/log/log.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/lsm/lsm_cursor.c b/src/lsm/lsm_cursor.c
index 21c1503d76d..254263e5096 100644
--- a/src/lsm/lsm_cursor.c
+++ b/src/lsm/lsm_cursor.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/lsm/lsm_dsrc.c b/src/lsm/lsm_dsrc.c
index 1c2ff20c3c9..d3fbf78e3e9 100644
--- a/src/lsm/lsm_dsrc.c
+++ b/src/lsm/lsm_dsrc.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/lsm/lsm_merge.c b/src/lsm/lsm_merge.c
index 90a99020692..183b53d7aad 100644
--- a/src/lsm/lsm_merge.c
+++ b/src/lsm/lsm_merge.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/lsm/lsm_meta.c b/src/lsm/lsm_meta.c
index 1ced10b0114..b3335089ae8 100644
--- a/src/lsm/lsm_meta.c
+++ b/src/lsm/lsm_meta.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/lsm/lsm_stat.c b/src/lsm/lsm_stat.c
index 9a47f59d83d..e4e36311862 100644
--- a/src/lsm/lsm_stat.c
+++ b/src/lsm/lsm_stat.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/lsm/lsm_tree.c b/src/lsm/lsm_tree.c
index 20877a6c806..06bb53d8080 100644
--- a/src/lsm/lsm_tree.c
+++ b/src/lsm/lsm_tree.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/lsm/lsm_worker.c b/src/lsm/lsm_worker.c
index 4a0d70a8ea6..b050f72d1f3 100644
--- a/src/lsm/lsm_worker.c
+++ b/src/lsm/lsm_worker.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/meta/meta_api.c b/src/meta/meta_api.c
index dee40585f90..8aa3caa6fa2 100644
--- a/src/meta/meta_api.c
+++ b/src/meta/meta_api.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/meta/meta_apply.c b/src/meta/meta_apply.c
index 7e1f6bb066d..a2cb658e37a 100644
--- a/src/meta/meta_apply.c
+++ b/src/meta/meta_apply.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/meta/meta_ckpt.c b/src/meta/meta_ckpt.c
index 74231c989fe..22b620dbd7f 100644
--- a/src/meta/meta_ckpt.c
+++ b/src/meta/meta_ckpt.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/meta/meta_table.c b/src/meta/meta_table.c
index dace6900ce8..f39ff038761 100644
--- a/src/meta/meta_table.c
+++ b/src/meta/meta_table.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/meta/meta_track.c b/src/meta/meta_track.c
index 76622c21bf9..6615d4d31a8 100644
--- a/src/meta/meta_track.c
+++ b/src/meta/meta_track.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/meta/meta_turtle.c b/src/meta/meta_turtle.c
index 60ef19f24d6..28ca8908183 100644
--- a/src/meta/meta_turtle.c
+++ b/src/meta/meta_turtle.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/os_posix/os_abort.c b/src/os_posix/os_abort.c
index 9962fb60624..e711c6191c7 100644
--- a/src/os_posix/os_abort.c
+++ b/src/os_posix/os_abort.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/os_posix/os_alloc.c b/src/os_posix/os_alloc.c
index 14353a1a77d..8a3fb45eec1 100644
--- a/src/os_posix/os_alloc.c
+++ b/src/os_posix/os_alloc.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/os_posix/os_dlopen.c b/src/os_posix/os_dlopen.c
index 14f20501205..fb622b636f4 100644
--- a/src/os_posix/os_dlopen.c
+++ b/src/os_posix/os_dlopen.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/os_posix/os_errno.c b/src/os_posix/os_errno.c
index 778d114748e..301ef63fee5 100644
--- a/src/os_posix/os_errno.c
+++ b/src/os_posix/os_errno.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/os_posix/os_exist.c b/src/os_posix/os_exist.c
index 3b3174e7125..f7ef2692566 100644
--- a/src/os_posix/os_exist.c
+++ b/src/os_posix/os_exist.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/os_posix/os_filesize.c b/src/os_posix/os_filesize.c
index bfb9b39af6b..3a1e1bc6c73 100644
--- a/src/os_posix/os_filesize.c
+++ b/src/os_posix/os_filesize.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/os_posix/os_flock.c b/src/os_posix/os_flock.c
index 2967719fbb6..b88b6ef3b24 100644
--- a/src/os_posix/os_flock.c
+++ b/src/os_posix/os_flock.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/os_posix/os_fsync.c b/src/os_posix/os_fsync.c
index 5a67dabb313..abc71a73324 100644
--- a/src/os_posix/os_fsync.c
+++ b/src/os_posix/os_fsync.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/os_posix/os_ftruncate.c b/src/os_posix/os_ftruncate.c
index aece569f8ba..832c4d0207f 100644
--- a/src/os_posix/os_ftruncate.c
+++ b/src/os_posix/os_ftruncate.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/os_posix/os_getline.c b/src/os_posix/os_getline.c
index 9d8c8909127..5ab121f845c 100644
--- a/src/os_posix/os_getline.c
+++ b/src/os_posix/os_getline.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/os_posix/os_mtx.c b/src/os_posix/os_mtx.c
index 0a55f8bcbea..e90b8501a53 100644
--- a/src/os_posix/os_mtx.c
+++ b/src/os_posix/os_mtx.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/os_posix/os_open.c b/src/os_posix/os_open.c
index 6ecd72c3f8b..fd321b7759c 100644
--- a/src/os_posix/os_open.c
+++ b/src/os_posix/os_open.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/os_posix/os_priv.c b/src/os_posix/os_priv.c
index 49f9f1f4128..05d9db67748 100644
--- a/src/os_posix/os_priv.c
+++ b/src/os_posix/os_priv.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/os_posix/os_remove.c b/src/os_posix/os_remove.c
index 2538ca1c502..026a1e9740b 100644
--- a/src/os_posix/os_remove.c
+++ b/src/os_posix/os_remove.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/os_posix/os_rename.c b/src/os_posix/os_rename.c
index dba15feab1c..94ef1573fb6 100644
--- a/src/os_posix/os_rename.c
+++ b/src/os_posix/os_rename.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/os_posix/os_rw.c b/src/os_posix/os_rw.c
index 762f9be47e9..c355b054cb6 100644
--- a/src/os_posix/os_rw.c
+++ b/src/os_posix/os_rw.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/os_posix/os_sleep.c b/src/os_posix/os_sleep.c
index 715869344c1..1123d1ddfd2 100644
--- a/src/os_posix/os_sleep.c
+++ b/src/os_posix/os_sleep.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/os_posix/os_strtouq.c b/src/os_posix/os_strtouq.c
index d59566ce4d8..cb445261ce5 100644
--- a/src/os_posix/os_strtouq.c
+++ b/src/os_posix/os_strtouq.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/os_posix/os_thread.c b/src/os_posix/os_thread.c
index e155f191030..4e66cbbfc2b 100644
--- a/src/os_posix/os_thread.c
+++ b/src/os_posix/os_thread.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/os_posix/os_time.c b/src/os_posix/os_time.c
index 1a2c72381bb..8979d77f818 100644
--- a/src/os_posix/os_time.c
+++ b/src/os_posix/os_time.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/os_posix/os_yield.c b/src/os_posix/os_yield.c
index 6c7c7de3918..baa902ddc89 100644
--- a/src/os_posix/os_yield.c
+++ b/src/os_posix/os_yield.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/packing/packing.c b/src/packing/packing.c
index a10fbcb3c01..d0db6bf4128 100644
--- a/src/packing/packing.c
+++ b/src/packing/packing.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/packing/packing_api.c b/src/packing/packing_api.c
index e0861c837b8..143eee445eb 100644
--- a/src/packing/packing_api.c
+++ b/src/packing/packing_api.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/schema/schema_create.c b/src/schema/schema_create.c
index 222bab9de17..c4dbe94ca6d 100644
--- a/src/schema/schema_create.c
+++ b/src/schema/schema_create.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/schema/schema_drop.c b/src/schema/schema_drop.c
index 723bddaa39f..0844d6379c5 100644
--- a/src/schema/schema_drop.c
+++ b/src/schema/schema_drop.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/schema/schema_list.c b/src/schema/schema_list.c
index d647ae374cf..61dc88288eb 100644
--- a/src/schema/schema_list.c
+++ b/src/schema/schema_list.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/schema/schema_open.c b/src/schema/schema_open.c
index 7d078bf00f6..c624ccd0797 100644
--- a/src/schema/schema_open.c
+++ b/src/schema/schema_open.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/schema/schema_plan.c b/src/schema/schema_plan.c
index a9f41e79143..ccdde757dd6 100644
--- a/src/schema/schema_plan.c
+++ b/src/schema/schema_plan.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/schema/schema_project.c b/src/schema/schema_project.c
index ebf3a057f0e..372ad56cc91 100644
--- a/src/schema/schema_project.c
+++ b/src/schema/schema_project.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/schema/schema_rename.c b/src/schema/schema_rename.c
index b2364ee542f..3de113dab55 100644
--- a/src/schema/schema_rename.c
+++ b/src/schema/schema_rename.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/schema/schema_stat.c b/src/schema/schema_stat.c
index a4a415d8701..f0fe141cef9 100644
--- a/src/schema/schema_stat.c
+++ b/src/schema/schema_stat.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/schema/schema_truncate.c b/src/schema/schema_truncate.c
index 00bcfc71d10..ef5a3a24880 100644
--- a/src/schema/schema_truncate.c
+++ b/src/schema/schema_truncate.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/schema/schema_util.c b/src/schema/schema_util.c
index 8c5b2c74527..aef2206955b 100644
--- a/src/schema/schema_util.c
+++ b/src/schema/schema_util.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/schema/schema_worker.c b/src/schema/schema_worker.c
index 7ddfadd38ca..8efa92810f4 100644
--- a/src/schema/schema_worker.c
+++ b/src/schema/schema_worker.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/session/session_api.c b/src/session/session_api.c
index cc9bed1d011..cd039f7d2c7 100644
--- a/src/session/session_api.c
+++ b/src/session/session_api.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/session/session_btree.c b/src/session/session_btree.c
index f5d51bed90a..a1a80c6f508 100644
--- a/src/session/session_btree.c
+++ b/src/session/session_btree.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/session/session_salvage.c b/src/session/session_salvage.c
index 3769736c48f..e3de305eed7 100644
--- a/src/session/session_salvage.c
+++ b/src/session/session_salvage.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/support/cksum.c b/src/support/cksum.c
index 7d3aa97d85f..7e9befeb2fa 100644
--- a/src/support/cksum.c
+++ b/src/support/cksum.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2008-2012 WiredTiger, Inc.
+ * Public Domain 2008-2013 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
*
diff --git a/src/support/err.c b/src/support/err.c
index 768a01c35e1..9247d3f3abe 100644
--- a/src/support/err.c
+++ b/src/support/err.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
@@ -365,16 +365,17 @@ __wt_panic(WT_SESSION_IMPL *session)
"the WiredTiger library cannot continue; the process must exit "
"and restart");
-#ifdef HAVE_DIAGNOSTIC
- __wt_abort(session); /* Drop core if testing. */
- /* NOTREACHED */
-#endif
+#if !defined(HAVE_DIAGNOSTIC)
/*
* Chaos reigns within.
* Reflect, repent, and reboot.
* Order shall return.
*/
return (WT_PANIC);
+#endif
+
+ __wt_abort(session); /* Drop core if testing. */
+ /* NOTREACHED */
}
/*
@@ -388,11 +389,12 @@ __wt_illegal_value(WT_SESSION_IMPL *session, const char *name)
name == NULL ? "" : name, name == NULL ? "" : ": ",
"encountered an illegal file format or internal value");
-#ifdef HAVE_DIAGNOSTIC
+#if !defined(HAVE_DIAGNOSTIC)
+ return (__wt_panic(session));
+#endif
+
__wt_abort(session); /* Drop core if testing. */
/* NOTREACHED */
-#endif
- return (__wt_panic(session));
}
/*
diff --git a/src/support/filename.c b/src/support/filename.c
index a886b3f09f9..1b2223a50ef 100644
--- a/src/support/filename.c
+++ b/src/support/filename.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/support/global.c b/src/support/global.c
index 4d6420e6d14..5a505b6866c 100644
--- a/src/support/global.c
+++ b/src/support/global.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/support/hash_city.c b/src/support/hash_city.c
index 2fc5869400f..f6fa87b475a 100644
--- a/src/support/hash_city.c
+++ b/src/support/hash_city.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2008-2012 WiredTiger, Inc.
+ * Public Domain 2008-2013 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
*
diff --git a/src/support/hash_fnv.c b/src/support/hash_fnv.c
index 457eaa2d857..05116f406d2 100644
--- a/src/support/hash_fnv.c
+++ b/src/support/hash_fnv.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2008-2012 WiredTiger, Inc.
+ * Public Domain 2008-2013 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
*
diff --git a/src/support/hazard.c b/src/support/hazard.c
index 7eb0cf4e5bc..3403ce4e12b 100644
--- a/src/support/hazard.c
+++ b/src/support/hazard.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/support/hex.c b/src/support/hex.c
index e918ae885d9..079260a4eab 100644
--- a/src/support/hex.c
+++ b/src/support/hex.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/support/huffman.c b/src/support/huffman.c
index 8781e2b0ff3..925d0fa185b 100644
--- a/src/support/huffman.c
+++ b/src/support/huffman.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/support/pow.c b/src/support/pow.c
index 3273a66c61e..f8f0cf3b209 100644
--- a/src/support/pow.c
+++ b/src/support/pow.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2008-2012 WiredTiger, Inc.
+ * Public Domain 2008-2013 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
*
diff --git a/src/support/rand.c b/src/support/rand.c
index cc6c446abaf..e26de16affd 100644
--- a/src/support/rand.c
+++ b/src/support/rand.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2008-2012 WiredTiger, Inc.
+ * Public Domain 2008-2013 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
*
diff --git a/src/support/scratch.c b/src/support/scratch.c
index 637cfb0e769..6c4e77289a7 100644
--- a/src/support/scratch.c
+++ b/src/support/scratch.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/support/sess_dump.c b/src/support/sess_dump.c
index 7f9da5e3641..579a864b4ed 100644
--- a/src/support/sess_dump.c
+++ b/src/support/sess_dump.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/txn/txn.c b/src/txn/txn.c
index 00ae3bd4389..da17ce4224a 100644
--- a/src/txn/txn.c
+++ b/src/txn/txn.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/txn/txn_ckpt.c b/src/txn/txn_ckpt.c
index 263189c31ff..710b02c2518 100644
--- a/src/txn/txn_ckpt.c
+++ b/src/txn/txn_ckpt.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/utilities/util.h b/src/utilities/util.h
index b2dd594c757..cdf51946fc6 100644
--- a/src/utilities/util.h
+++ b/src/utilities/util.h
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/utilities/util_backup.c b/src/utilities/util_backup.c
index 2ee967b2099..a5de7d219a2 100644
--- a/src/utilities/util_backup.c
+++ b/src/utilities/util_backup.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/utilities/util_compact.c b/src/utilities/util_compact.c
index 11ee6ddaf14..eff253f9b65 100644
--- a/src/utilities/util_compact.c
+++ b/src/utilities/util_compact.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/utilities/util_cpyright.c b/src/utilities/util_cpyright.c
index 7297dff19f5..e97444f0303 100644
--- a/src/utilities/util_cpyright.c
+++ b/src/utilities/util_cpyright.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
@@ -10,7 +10,7 @@
void
util_copyright(void)
{
- printf("%s\n", "Copyright (c) 2008-2012 WiredTiger, Inc.");
+ printf("%s\n", "Copyright (c) 2008-2013 WiredTiger, Inc.");
printf("%s\n\n", "All rights reserved.");
printf("%s\n\n",
diff --git a/src/utilities/util_create.c b/src/utilities/util_create.c
index 750777a7c3a..607f52954d2 100644
--- a/src/utilities/util_create.c
+++ b/src/utilities/util_create.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/utilities/util_drop.c b/src/utilities/util_drop.c
index 0e96e2578c6..0f8567d0c14 100644
--- a/src/utilities/util_drop.c
+++ b/src/utilities/util_drop.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/utilities/util_dump.c b/src/utilities/util_dump.c
index abacccf8093..887859160fb 100644
--- a/src/utilities/util_dump.c
+++ b/src/utilities/util_dump.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/utilities/util_getopt.c b/src/utilities/util_getopt.c
index f06fe24ead7..11edeb3805b 100644
--- a/src/utilities/util_getopt.c
+++ b/src/utilities/util_getopt.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2008-2012 WiredTiger, Inc.
+ * Public Domain 2008-2013 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
*
diff --git a/src/utilities/util_list.c b/src/utilities/util_list.c
index 8092f4eab3a..55a5114899a 100644
--- a/src/utilities/util_list.c
+++ b/src/utilities/util_list.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/utilities/util_load.c b/src/utilities/util_load.c
index 148da0c08a1..19796750fbb 100644
--- a/src/utilities/util_load.c
+++ b/src/utilities/util_load.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/utilities/util_loadtext.c b/src/utilities/util_loadtext.c
index b7f9fa2cafc..49c15d47422 100644
--- a/src/utilities/util_loadtext.c
+++ b/src/utilities/util_loadtext.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/utilities/util_main.c b/src/utilities/util_main.c
index 6b8b91fa2db..8671546df0b 100644
--- a/src/utilities/util_main.c
+++ b/src/utilities/util_main.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/utilities/util_misc.c b/src/utilities/util_misc.c
index 1033520d628..f562f48cb97 100644
--- a/src/utilities/util_misc.c
+++ b/src/utilities/util_misc.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/utilities/util_printlog.c b/src/utilities/util_printlog.c
index e19c1ed787c..b62954a6b51 100644
--- a/src/utilities/util_printlog.c
+++ b/src/utilities/util_printlog.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/utilities/util_read.c b/src/utilities/util_read.c
index 0956adf06c4..ee7f22cba01 100644
--- a/src/utilities/util_read.c
+++ b/src/utilities/util_read.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/utilities/util_rename.c b/src/utilities/util_rename.c
index c2ddb2998ad..b318d8412d2 100644
--- a/src/utilities/util_rename.c
+++ b/src/utilities/util_rename.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/utilities/util_salvage.c b/src/utilities/util_salvage.c
index 82c247fe0ac..e1817b5a621 100644
--- a/src/utilities/util_salvage.c
+++ b/src/utilities/util_salvage.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/utilities/util_stat.c b/src/utilities/util_stat.c
index efc74db2514..fe8cd41616a 100644
--- a/src/utilities/util_stat.c
+++ b/src/utilities/util_stat.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/utilities/util_upgrade.c b/src/utilities/util_upgrade.c
index 89fca16e548..bc913b956f3 100644
--- a/src/utilities/util_upgrade.c
+++ b/src/utilities/util_upgrade.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/utilities/util_verbose.c b/src/utilities/util_verbose.c
index adea9687758..cc1667a490c 100644
--- a/src/utilities/util_verbose.c
+++ b/src/utilities/util_verbose.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/utilities/util_verify.c b/src/utilities/util_verify.c
index 3ae94594737..66d7d08044d 100644
--- a/src/utilities/util_verify.c
+++ b/src/utilities/util_verify.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/src/utilities/util_write.c b/src/utilities/util_write.c
index ad1f47b067d..815683fa977 100644
--- a/src/utilities/util_write.c
+++ b/src/utilities/util_write.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008-2012 WiredTiger, Inc.
+ * Copyright (c) 2008-2013 WiredTiger, Inc.
* All rights reserved.
*
* See the file LICENSE for redistribution information.
diff --git a/test/bloom/test_bloom.c b/test/bloom/test_bloom.c
index abce12f8202..638d23b065b 100644
--- a/test/bloom/test_bloom.c
+++ b/test/bloom/test_bloom.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2008-2012 WiredTiger, Inc.
+ * Public Domain 2008-2013 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
*
diff --git a/test/fops/file.c b/test/fops/file.c
index f55d13887e0..3ff0c860e5b 100644
--- a/test/fops/file.c
+++ b/test/fops/file.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2008-2012 WiredTiger, Inc.
+ * Public Domain 2008-2013 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
*
diff --git a/test/fops/fops.c b/test/fops/fops.c
index 04e93634d4c..4524f6feb5c 100644
--- a/test/fops/fops.c
+++ b/test/fops/fops.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2008-2012 WiredTiger, Inc.
+ * Public Domain 2008-2013 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
*
diff --git a/test/fops/t.c b/test/fops/t.c
index 4650bfd8892..e2c2833d8fd 100644
--- a/test/fops/t.c
+++ b/test/fops/t.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2008-2012 WiredTiger, Inc.
+ * Public Domain 2008-2013 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
*
diff --git a/test/fops/thread.h b/test/fops/thread.h
index be850c283a8..4d118efa4de 100644
--- a/test/fops/thread.h
+++ b/test/fops/thread.h
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2008-2012 WiredTiger, Inc.
+ * Public Domain 2008-2013 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
*
diff --git a/test/format/bdb.c b/test/format/bdb.c
index c7206775652..a9502528168 100644
--- a/test/format/bdb.c
+++ b/test/format/bdb.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2008-2012 WiredTiger, Inc.
+ * Public Domain 2008-2013 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
*
diff --git a/test/format/config.c b/test/format/config.c
index 8b10a7bdea9..24ad4651d43 100644
--- a/test/format/config.c
+++ b/test/format/config.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2008-2012 WiredTiger, Inc.
+ * Public Domain 2008-2013 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
*
diff --git a/test/format/config.h b/test/format/config.h
index ebe553044cc..a333c3575d9 100644
--- a/test/format/config.h
+++ b/test/format/config.h
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2008-2012 WiredTiger, Inc.
+ * Public Domain 2008-2013 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
*
diff --git a/test/format/format.h b/test/format/format.h
index ba9c5c0fe25..73d467e5ff0 100644
--- a/test/format/format.h
+++ b/test/format/format.h
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2008-2012 WiredTiger, Inc.
+ * Public Domain 2008-2013 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
*
diff --git a/test/format/t.c b/test/format/t.c
index fd1ec00b96a..cc70c4c7dd2 100644
--- a/test/format/t.c
+++ b/test/format/t.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2008-2012 WiredTiger, Inc.
+ * Public Domain 2008-2013 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
*
diff --git a/test/format/util.c b/test/format/util.c
index 5b0faff4008..3665274f836 100644
--- a/test/format/util.c
+++ b/test/format/util.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2008-2012 WiredTiger, Inc.
+ * Public Domain 2008-2013 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
*
diff --git a/test/format/wts.c b/test/format/wts.c
index 1fd09584541..7d5aa5bf06e 100644
--- a/test/format/wts.c
+++ b/test/format/wts.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2008-2012 WiredTiger, Inc.
+ * Public Domain 2008-2013 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
*
diff --git a/test/format/wts_bulk.c b/test/format/wts_bulk.c
index f53733ca869..2894b7d885f 100644
--- a/test/format/wts_bulk.c
+++ b/test/format/wts_bulk.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2008-2012 WiredTiger, Inc.
+ * Public Domain 2008-2013 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
*
diff --git a/test/format/wts_ops.c b/test/format/wts_ops.c
index 37bbe49b7de..9cc93b2029e 100644
--- a/test/format/wts_ops.c
+++ b/test/format/wts_ops.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2008-2012 WiredTiger, Inc.
+ * Public Domain 2008-2013 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
*
diff --git a/test/packing/intpack-test.c b/test/packing/intpack-test.c
index ef82a290bc6..8501e4574ca 100644
--- a/test/packing/intpack-test.c
+++ b/test/packing/intpack-test.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2008-2012 WiredTiger, Inc.
+ * Public Domain 2008-2013 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
*
diff --git a/test/packing/intpack-test2.c b/test/packing/intpack-test2.c
index 9b788f408c5..ebfbf4059fe 100644
--- a/test/packing/intpack-test2.c
+++ b/test/packing/intpack-test2.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2008-2012 WiredTiger, Inc.
+ * Public Domain 2008-2013 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
*
diff --git a/test/packing/packing-test.c b/test/packing/packing-test.c
index 4b87a683f47..d273789e50b 100644
--- a/test/packing/packing-test.c
+++ b/test/packing/packing-test.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2008-2012 WiredTiger, Inc.
+ * Public Domain 2008-2013 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
*
diff --git a/test/salvage/salvage.c b/test/salvage/salvage.c
index 437716970b9..e8a473c7d89 100644
--- a/test/salvage/salvage.c
+++ b/test/salvage/salvage.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2008-2012 WiredTiger, Inc.
+ * Public Domain 2008-2013 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
*
diff --git a/test/suite/helper.py b/test/suite/helper.py
index 728782a3297..fa8e95d249d 100644
--- a/test/suite/helper.py
+++ b/test/suite/helper.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2008-2012 WiredTiger, Inc.
+# Public Domain 2008-2013 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
#
diff --git a/test/suite/run.py b/test/suite/run.py
index b9ce43e48e9..c2f06146ce2 100644
--- a/test/suite/run.py
+++ b/test/suite/run.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2008-2012 WiredTiger, Inc.
+# Public Domain 2008-2013 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
#
diff --git a/test/suite/suite_random.py b/test/suite/suite_random.py
index 7643e377850..ed39ef59960 100644
--- a/test/suite/suite_random.py
+++ b/test/suite/suite_random.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2008-2012 WiredTiger, Inc.
+# Public Domain 2008-2013 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
#
diff --git a/test/suite/suite_subprocess.py b/test/suite/suite_subprocess.py
index 8be392e3fb8..d9657bcdd85 100644
--- a/test/suite/suite_subprocess.py
+++ b/test/suite/suite_subprocess.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2008-2012 WiredTiger, Inc.
+# Public Domain 2008-2013 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
#
diff --git a/test/suite/test_backup.py b/test/suite/test_backup.py
index 59407c3d5ee..c53cd60f554 100644
--- a/test/suite/test_backup.py
+++ b/test/suite/test_backup.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2008-2012 WiredTiger, Inc.
+# Public Domain 2008-2013 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
#
diff --git a/test/suite/test_backup02.py b/test/suite/test_backup02.py
index c76d003f6d3..f8e1647902b 100644
--- a/test/suite/test_backup02.py
+++ b/test/suite/test_backup02.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2008-2012 WiredTiger, Inc.
+# Public Domain 2008-2013 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
#
diff --git a/test/suite/test_base01.py b/test/suite/test_base01.py
index d021653b9f5..3f8fb389a8f 100644
--- a/test/suite/test_base01.py
+++ b/test/suite/test_base01.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2008-2012 WiredTiger, Inc.
+# Public Domain 2008-2013 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
#
diff --git a/test/suite/test_base02.py b/test/suite/test_base02.py
index 67d656df0ae..2df075e96cb 100644
--- a/test/suite/test_base02.py
+++ b/test/suite/test_base02.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2008-2012 WiredTiger, Inc.
+# Public Domain 2008-2013 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
#
diff --git a/test/suite/test_base03.py b/test/suite/test_base03.py
index 4fa46060f64..4fd9807a9e0 100644
--- a/test/suite/test_base03.py
+++ b/test/suite/test_base03.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2008-2012 WiredTiger, Inc.
+# Public Domain 2008-2013 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
#
diff --git a/test/suite/test_base04.py b/test/suite/test_base04.py
index d1f1e97a9ec..3ece0c3247c 100644
--- a/test/suite/test_base04.py
+++ b/test/suite/test_base04.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2008-2012 WiredTiger, Inc.
+# Public Domain 2008-2013 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
#
diff --git a/test/suite/test_base05.py b/test/suite/test_base05.py
index 31ba8381e38..7eaf720f8bf 100644
--- a/test/suite/test_base05.py
+++ b/test/suite/test_base05.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2008-2012 WiredTiger, Inc.
+# Public Domain 2008-2013 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
#
diff --git a/test/suite/test_bug001.py b/test/suite/test_bug001.py
index 4711203953c..602a51b984d 100644
--- a/test/suite/test_bug001.py
+++ b/test/suite/test_bug001.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2008-2012 WiredTiger, Inc.
+# Public Domain 2008-2013 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
#
diff --git a/test/suite/test_bug002.py b/test/suite/test_bug002.py
index 193d2d21129..dc6c12f22cf 100644
--- a/test/suite/test_bug002.py
+++ b/test/suite/test_bug002.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2008-2012 WiredTiger, Inc.
+# Public Domain 2008-2013 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
#
diff --git a/test/suite/test_bug003.py b/test/suite/test_bug003.py
index cf35da5d171..f698c1fd3a3 100644
--- a/test/suite/test_bug003.py
+++ b/test/suite/test_bug003.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2008-2012 WiredTiger, Inc.
+# Public Domain 2008-2013 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
#
diff --git a/test/suite/test_bug004.py b/test/suite/test_bug004.py
index 2013859c6b0..0c2b9e43c83 100644
--- a/test/suite/test_bug004.py
+++ b/test/suite/test_bug004.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2008-2012 WiredTiger, Inc.
+# Public Domain 2008-2013 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
#
diff --git a/test/suite/test_bulk.py b/test/suite/test_bulk.py
index 4a1006124ef..3380f54711f 100644
--- a/test/suite/test_bulk.py
+++ b/test/suite/test_bulk.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2008-2012 WiredTiger, Inc.
+# Public Domain 2008-2013 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
#
diff --git a/test/suite/test_checkpoint01.py b/test/suite/test_checkpoint01.py
index 5f232a0b92c..1e21b0f0155 100644
--- a/test/suite/test_checkpoint01.py
+++ b/test/suite/test_checkpoint01.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2008-2012 WiredTiger, Inc.
+# Public Domain 2008-2013 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
#
diff --git a/test/suite/test_checkpoint02.py b/test/suite/test_checkpoint02.py
index bff10ff65e0..107359c3938 100644
--- a/test/suite/test_checkpoint02.py
+++ b/test/suite/test_checkpoint02.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2008-2012 WiredTiger, Inc.
+# Public Domain 2008-2013 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
#
diff --git a/test/suite/test_compact.py b/test/suite/test_compact.py
index e470bc173ad..2f3a3b6e052 100644
--- a/test/suite/test_compact.py
+++ b/test/suite/test_compact.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2008-2012 WiredTiger, Inc.
+# Public Domain 2008-2013 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
#
diff --git a/test/suite/test_compress01.py b/test/suite/test_compress01.py
index f5fc857424f..87138034328 100644
--- a/test/suite/test_compress01.py
+++ b/test/suite/test_compress01.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2008-2012 WiredTiger, Inc.
+# Public Domain 2008-2013 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
#
diff --git a/test/suite/test_config01.py b/test/suite/test_config01.py
index 7a47ec962c0..ac4602d12a9 100644
--- a/test/suite/test_config01.py
+++ b/test/suite/test_config01.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2008-2012 WiredTiger, Inc.
+# Public Domain 2008-2013 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
#
diff --git a/test/suite/test_config02.py b/test/suite/test_config02.py
index 5c3fec9f24f..edbfb1241e5 100644
--- a/test/suite/test_config02.py
+++ b/test/suite/test_config02.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2008-2012 WiredTiger, Inc.
+# Public Domain 2008-2013 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
#
diff --git a/test/suite/test_config03.py b/test/suite/test_config03.py
index 5fd44c2d3ef..88cf8db66d3 100644
--- a/test/suite/test_config03.py
+++ b/test/suite/test_config03.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2008-2012 WiredTiger, Inc.
+# Public Domain 2008-2013 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
#
diff --git a/test/suite/test_config04.py b/test/suite/test_config04.py
index 14918636f19..72841af4c5b 100644
--- a/test/suite/test_config04.py
+++ b/test/suite/test_config04.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2008-2012 WiredTiger, Inc.
+# Public Domain 2008-2013 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
#
diff --git a/test/suite/test_config05.py b/test/suite/test_config05.py
index cd47455546e..41b8586f732 100644
--- a/test/suite/test_config05.py
+++ b/test/suite/test_config05.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2008-2012 WiredTiger, Inc.
+# Public Domain 2008-2013 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
#
diff --git a/test/suite/test_cursor01.py b/test/suite/test_cursor01.py
index f4c448187c5..2ad318db358 100644
--- a/test/suite/test_cursor01.py
+++ b/test/suite/test_cursor01.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2008-2012 WiredTiger, Inc.
+# Public Domain 2008-2013 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
#
diff --git a/test/suite/test_cursor02.py b/test/suite/test_cursor02.py
index da49515dc52..8ead2b13690 100644
--- a/test/suite/test_cursor02.py
+++ b/test/suite/test_cursor02.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2008-2012 WiredTiger, Inc.
+# Public Domain 2008-2013 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
#
diff --git a/test/suite/test_cursor03.py b/test/suite/test_cursor03.py
index a7d34cc873d..61b2711a3c2 100644
--- a/test/suite/test_cursor03.py
+++ b/test/suite/test_cursor03.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2008-2012 WiredTiger, Inc.
+# Public Domain 2008-2013 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
#
diff --git a/test/suite/test_cursor04.py b/test/suite/test_cursor04.py
index 55a884f80c5..54421eebab7 100644
--- a/test/suite/test_cursor04.py
+++ b/test/suite/test_cursor04.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2008-2012 WiredTiger, Inc.
+# Public Domain 2008-2013 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
#
diff --git a/test/suite/test_cursor05.py b/test/suite/test_cursor05.py
index 23b39e445ed..627bd8a2d7c 100644
--- a/test/suite/test_cursor05.py
+++ b/test/suite/test_cursor05.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2008-2012 WiredTiger, Inc.
+# Public Domain 2008-2013 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
#
diff --git a/test/suite/test_cursor_compare.py b/test/suite/test_cursor_compare.py
index 7492f883fac..43e63253aa4 100644
--- a/test/suite/test_cursor_compare.py
+++ b/test/suite/test_cursor_compare.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2008-2012 WiredTiger, Inc.
+# Public Domain 2008-2013 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
#
diff --git a/test/suite/test_cursor_random.py b/test/suite/test_cursor_random.py
index 63c4d2a04b9..929355042ba 100644
--- a/test/suite/test_cursor_random.py
+++ b/test/suite/test_cursor_random.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2008-2012 WiredTiger, Inc.
+# Public Domain 2008-2013 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
#
diff --git a/test/suite/test_cursor_tracker.py b/test/suite/test_cursor_tracker.py
index 3e50b55cd98..6a23ca60d25 100644
--- a/test/suite/test_cursor_tracker.py
+++ b/test/suite/test_cursor_tracker.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2008-2012 WiredTiger, Inc.
+# Public Domain 2008-2013 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
#
diff --git a/test/suite/test_drop.py b/test/suite/test_drop.py
index 80ace1f74d5..8e656cae4f4 100644
--- a/test/suite/test_drop.py
+++ b/test/suite/test_drop.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2008-2012 WiredTiger, Inc.
+# Public Domain 2008-2013 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
#
diff --git a/test/suite/test_drop_create.py b/test/suite/test_drop_create.py
index 6699bc389fe..cf9971d6efd 100644
--- a/test/suite/test_drop_create.py
+++ b/test/suite/test_drop_create.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2008-2012 WiredTiger, Inc.
+# Public Domain 2008-2013 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
#
diff --git a/test/suite/test_dump.py b/test/suite/test_dump.py
index 9968b2c7568..76e42b77afe 100644
--- a/test/suite/test_dump.py
+++ b/test/suite/test_dump.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2008-2012 WiredTiger, Inc.
+# Public Domain 2008-2013 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
#
diff --git a/test/suite/test_dupc.py b/test/suite/test_dupc.py
index 143dd8669ac..4e183ddfff6 100644
--- a/test/suite/test_dupc.py
+++ b/test/suite/test_dupc.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2008-2012 WiredTiger, Inc.
+# Public Domain 2008-2013 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
#
diff --git a/test/suite/test_empty.py b/test/suite/test_empty.py
index bd83d3fbc1d..a7dbc760573 100644
--- a/test/suite/test_empty.py
+++ b/test/suite/test_empty.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2008-2012 WiredTiger, Inc.
+# Public Domain 2008-2013 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
#
diff --git a/test/suite/test_excl.py b/test/suite/test_excl.py
index b12c03990a3..6014886fe22 100644
--- a/test/suite/test_excl.py
+++ b/test/suite/test_excl.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2008-2012 WiredTiger, Inc.
+# Public Domain 2008-2013 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
#
diff --git a/test/suite/test_gethome.py b/test/suite/test_gethome.py
index a4789b6d6d1..3550a861bdb 100644
--- a/test/suite/test_gethome.py
+++ b/test/suite/test_gethome.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2008-2012 WiredTiger, Inc.
+# Public Domain 2008-2013 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
#
diff --git a/test/suite/test_index01.py b/test/suite/test_index01.py
index b7eb7586f55..c696ce494a3 100644
--- a/test/suite/test_index01.py
+++ b/test/suite/test_index01.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2008-2012 WiredTiger, Inc.
+# Public Domain 2008-2013 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
#
diff --git a/test/suite/test_isnew.py b/test/suite/test_isnew.py
index 5746066297e..41064978d49 100644
--- a/test/suite/test_isnew.py
+++ b/test/suite/test_isnew.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2008-2012 WiredTiger, Inc.
+# Public Domain 2008-2013 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
#
diff --git a/test/suite/test_lsm01.py b/test/suite/test_lsm01.py
index af427dafd33..5f19c6e4a3b 100644
--- a/test/suite/test_lsm01.py
+++ b/test/suite/test_lsm01.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2008-2012 WiredTiger, Inc.
+# Public Domain 2008-2013 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
#
diff --git a/test/suite/test_lsm02.py b/test/suite/test_lsm02.py
index 965f22f5985..40d12d8bdaf 100644
--- a/test/suite/test_lsm02.py
+++ b/test/suite/test_lsm02.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2008-2012 WiredTiger, Inc.
+# Public Domain 2008-2013 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
#
diff --git a/test/suite/test_nocache.py b/test/suite/test_nocache.py
index 55d6e42dd84..b876862e89b 100644
--- a/test/suite/test_nocache.py
+++ b/test/suite/test_nocache.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2008-2012 WiredTiger, Inc.
+# Public Domain 2008-2013 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
#
diff --git a/test/suite/test_overwrite.py b/test/suite/test_overwrite.py
index f8f82bcd936..8524c3e324b 100644
--- a/test/suite/test_overwrite.py
+++ b/test/suite/test_overwrite.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2008-2012 WiredTiger, Inc.
+# Public Domain 2008-2013 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
#
diff --git a/test/suite/test_priv01.py b/test/suite/test_priv01.py
index 1e3b2a8325a..4ce22828b31 100644
--- a/test/suite/test_priv01.py
+++ b/test/suite/test_priv01.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2008-2012 WiredTiger, Inc.
+# Public Domain 2008-2013 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
#
diff --git a/test/suite/test_rename.py b/test/suite/test_rename.py
index 8f33100ebfa..1550dc46411 100644
--- a/test/suite/test_rename.py
+++ b/test/suite/test_rename.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2008-2012 WiredTiger, Inc.
+# Public Domain 2008-2013 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
#
diff --git a/test/suite/test_salvage.py b/test/suite/test_salvage.py
index 285b7ba4f32..691d7a5175b 100644
--- a/test/suite/test_salvage.py
+++ b/test/suite/test_salvage.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2008-2012 WiredTiger, Inc.
+# Public Domain 2008-2013 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
#
diff --git a/test/suite/test_schema01.py b/test/suite/test_schema01.py
index c8236f80a9c..b3bbbbc48aa 100644
--- a/test/suite/test_schema01.py
+++ b/test/suite/test_schema01.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2008-2012 WiredTiger, Inc.
+# Public Domain 2008-2013 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
#
diff --git a/test/suite/test_schema02.py b/test/suite/test_schema02.py
index 30241d3cb13..09058dcd445 100644
--- a/test/suite/test_schema02.py
+++ b/test/suite/test_schema02.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2008-2012 WiredTiger, Inc.
+# Public Domain 2008-2013 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
#
diff --git a/test/suite/test_schema03.py b/test/suite/test_schema03.py
index 17a2fb1d06e..7a22aa95650 100644
--- a/test/suite/test_schema03.py
+++ b/test/suite/test_schema03.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2008-2012 WiredTiger, Inc.
+# Public Domain 2008-2013 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
#
diff --git a/test/suite/test_shared_cache.py b/test/suite/test_shared_cache.py
index f830f5e8cd6..0441ccf2d87 100644
--- a/test/suite/test_shared_cache.py
+++ b/test/suite/test_shared_cache.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2008-2012 WiredTiger, Inc.
+# Public Domain 2008-2013 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
#
diff --git a/test/suite/test_stat01.py b/test/suite/test_stat01.py
index 86587d14620..37ea9441648 100644
--- a/test/suite/test_stat01.py
+++ b/test/suite/test_stat01.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2008-2012 WiredTiger, Inc.
+# Public Domain 2008-2013 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
#
diff --git a/test/suite/test_truncate01.py b/test/suite/test_truncate01.py
index 7361a215e86..8bc2182f6fb 100644
--- a/test/suite/test_truncate01.py
+++ b/test/suite/test_truncate01.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2008-2012 WiredTiger, Inc.
+# Public Domain 2008-2013 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
#
diff --git a/test/suite/test_truncate02.py b/test/suite/test_truncate02.py
index ee4fe758e5a..e77eba747aa 100644
--- a/test/suite/test_truncate02.py
+++ b/test/suite/test_truncate02.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2008-2012 WiredTiger, Inc.
+# Public Domain 2008-2013 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
#
diff --git a/test/suite/test_truncate03.py b/test/suite/test_truncate03.py
index c8692056b7d..be09d778a56 100644
--- a/test/suite/test_truncate03.py
+++ b/test/suite/test_truncate03.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2008-2012 WiredTiger, Inc.
+# Public Domain 2008-2013 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
#
diff --git a/test/suite/test_txn01.py b/test/suite/test_txn01.py
index 8f0549a772f..51af0532c37 100644
--- a/test/suite/test_txn01.py
+++ b/test/suite/test_txn01.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2008-2012 WiredTiger, Inc.
+# Public Domain 2008-2013 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
#
diff --git a/test/suite/test_txn02.py b/test/suite/test_txn02.py
index a3f370aa790..f1926024ffe 100644
--- a/test/suite/test_txn02.py
+++ b/test/suite/test_txn02.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2008-2012 WiredTiger, Inc.
+# Public Domain 2008-2013 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
#
diff --git a/test/suite/test_txn03.py b/test/suite/test_txn03.py
index 9b4ca37f369..aa074677a57 100644
--- a/test/suite/test_txn03.py
+++ b/test/suite/test_txn03.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2008-2012 WiredTiger, Inc.
+# Public Domain 2008-2013 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
#
diff --git a/test/suite/test_upgrade.py b/test/suite/test_upgrade.py
index f89a86bcd57..1a5a5fac479 100644
--- a/test/suite/test_upgrade.py
+++ b/test/suite/test_upgrade.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2008-2012 WiredTiger, Inc.
+# Public Domain 2008-2013 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
#
diff --git a/test/suite/test_util01.py b/test/suite/test_util01.py
index 45d95370a58..1154a88342f 100644
--- a/test/suite/test_util01.py
+++ b/test/suite/test_util01.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2008-2012 WiredTiger, Inc.
+# Public Domain 2008-2013 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
#
diff --git a/test/suite/test_util02.py b/test/suite/test_util02.py
index d3822aa425b..0d9a32f218c 100644
--- a/test/suite/test_util02.py
+++ b/test/suite/test_util02.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2008-2012 WiredTiger, Inc.
+# Public Domain 2008-2013 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
#
diff --git a/test/suite/test_util03.py b/test/suite/test_util03.py
index 78a10bd0ae2..17b35bd926b 100644
--- a/test/suite/test_util03.py
+++ b/test/suite/test_util03.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2008-2012 WiredTiger, Inc.
+# Public Domain 2008-2013 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
#
diff --git a/test/suite/test_util04.py b/test/suite/test_util04.py
index 52c481de777..b5deb77a1cc 100644
--- a/test/suite/test_util04.py
+++ b/test/suite/test_util04.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2008-2012 WiredTiger, Inc.
+# Public Domain 2008-2013 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
#
diff --git a/test/suite/test_util07.py b/test/suite/test_util07.py
index d47c13f399f..a1801e8fd21 100644
--- a/test/suite/test_util07.py
+++ b/test/suite/test_util07.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2008-2012 WiredTiger, Inc.
+# Public Domain 2008-2013 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
#
diff --git a/test/suite/test_util08.py b/test/suite/test_util08.py
index c104ef48157..ad7fee547a2 100644
--- a/test/suite/test_util08.py
+++ b/test/suite/test_util08.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2008-2012 WiredTiger, Inc.
+# Public Domain 2008-2013 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
#
diff --git a/test/suite/test_util09.py b/test/suite/test_util09.py
index 4a4cb3bf4e9..082e2d73c74 100644
--- a/test/suite/test_util09.py
+++ b/test/suite/test_util09.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2008-2012 WiredTiger, Inc.
+# Public Domain 2008-2013 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
#
diff --git a/test/suite/test_util11.py b/test/suite/test_util11.py
index d24f2213794..eafcc541583 100644
--- a/test/suite/test_util11.py
+++ b/test/suite/test_util11.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2008-2012 WiredTiger, Inc.
+# Public Domain 2008-2013 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
#
diff --git a/test/suite/test_util12.py b/test/suite/test_util12.py
index dc196848e59..d4779031ff7 100644
--- a/test/suite/test_util12.py
+++ b/test/suite/test_util12.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2008-2012 WiredTiger, Inc.
+# Public Domain 2008-2013 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
#
diff --git a/test/suite/test_verify.py b/test/suite/test_verify.py
index be98a3396f3..6241b5ac4fd 100644
--- a/test/suite/test_verify.py
+++ b/test/suite/test_verify.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2008-2012 WiredTiger, Inc.
+# Public Domain 2008-2013 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
#
diff --git a/test/suite/test_version.py b/test/suite/test_version.py
index 00cd73a5503..e923ed05fbe 100644
--- a/test/suite/test_version.py
+++ b/test/suite/test_version.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2008-2012 WiredTiger, Inc.
+# Public Domain 2008-2013 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
#
diff --git a/test/suite/wtscenario.py b/test/suite/wtscenario.py
index 67b5b68e442..e7e164d8247 100644
--- a/test/suite/wtscenario.py
+++ b/test/suite/wtscenario.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2008-2012 WiredTiger, Inc.
+# Public Domain 2008-2013 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
#
diff --git a/test/suite/wttest.py b/test/suite/wttest.py
index b75b1a08aa9..2e5234fd7cb 100644
--- a/test/suite/wttest.py
+++ b/test/suite/wttest.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2008-2012 WiredTiger, Inc.
+# Public Domain 2008-2013 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
#
diff --git a/test/suite/wtthread.py b/test/suite/wtthread.py
index ec12347c315..20e141a730e 100644
--- a/test/suite/wtthread.py
+++ b/test/suite/wtthread.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Public Domain 2008-2012 WiredTiger, Inc.
+# Public Domain 2008-2013 WiredTiger, Inc.
#
# This is free and unencumbered software released into the public domain.
#
diff --git a/test/thread/file.c b/test/thread/file.c
index 30d968d34db..16e21e09603 100644
--- a/test/thread/file.c
+++ b/test/thread/file.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2008-2012 WiredTiger, Inc.
+ * Public Domain 2008-2013 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
*
diff --git a/test/thread/rw.c b/test/thread/rw.c
index bd8b1250fc7..226d460e4cc 100644
--- a/test/thread/rw.c
+++ b/test/thread/rw.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2008-2012 WiredTiger, Inc.
+ * Public Domain 2008-2013 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
*
diff --git a/test/thread/stats.c b/test/thread/stats.c
index 61fc0c03fd3..b6b8269027f 100644
--- a/test/thread/stats.c
+++ b/test/thread/stats.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2008-2012 WiredTiger, Inc.
+ * Public Domain 2008-2013 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
*
diff --git a/test/thread/t.c b/test/thread/t.c
index 313f63d7420..581016e45a6 100644
--- a/test/thread/t.c
+++ b/test/thread/t.c
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2008-2012 WiredTiger, Inc.
+ * Public Domain 2008-2013 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
*
diff --git a/test/thread/thread.h b/test/thread/thread.h
index 418b765633e..409b99ab998 100644
--- a/test/thread/thread.h
+++ b/test/thread/thread.h
@@ -1,5 +1,5 @@
/*-
- * Public Domain 2008-2012 WiredTiger, Inc.
+ * Public Domain 2008-2013 WiredTiger, Inc.
*
* This is free and unencumbered software released into the public domain.
*