Follow-on: do not override global 'db' in compact tests

2 files changed, 9 insertions, 9 deletions

diff --git a/jstests/compact.js b/jstests/compact.js
index 751e24d5339..2121debc17e 100644
--- a/jstests/compact.js
+++ b/jstests/compact.js
@@ -1,7 +1,7 @@
 // compact.js
 
-var db = db.getSiblingDB('compact');
-t = db.compacttest;
+var mydb = db.getSiblingDB('compact');
+t = mydb.compacttest;
 t.drop();
 t.insert({ x: 3 });
 t.insert({ x: 3 });
@@ -16,7 +16,7 @@ t.ensureIndex({ x: 1 });
 
 print("1");
 
-var res = db.runCommand({ compact: 'compacttest', dev: true, force: true });
+var res = mydb.runCommand({ compact: 'compacttest', dev: true, force: true });
 printjson(res);
 assert(res.ok);
 assert(t.count() == 9);
@@ -28,7 +28,7 @@ assert(t.getIndexes().length == 2);
 var ssize = t.stats().storageSize;
 
 print("2");
-res = db.runCommand({ compact: 'compacttest', dev: true,paddingBytes:1000, force:true });
+res = mydb.runCommand({ compact: 'compacttest', dev: true,paddingBytes:1000, force:true });
 assert(res.ok);
 assert(t.count() == 9);
 var v = t.validate(true);
@@ -56,7 +56,7 @@ t.ensureIndex({ z: 1, k: 1 });
 //t.ensureIndex({ z: 1, k: 1 }, { unique: true });
 //t.ensureIndex({ z: 1, k: 1 }, { dropDups: true, unique:true });
 
-res = db.runCommand({ compact: 'compacttest', dev: true, paddingFactor: 1.2, force:true });
+res = mydb.runCommand({ compact: 'compacttest', dev: true, paddingFactor: 1.2, force:true });
 printjson(res);
 assert(res.ok);
 assert(t.count() > 13);
@@ -67,7 +67,7 @@ print("3");
 
 // works on an empty collection?
 t.remove({});
-assert(db.runCommand({ compact: 'compacttest', dev: true, force:true }).ok);
+assert(mydb.runCommand({ compact: 'compacttest', dev: true, force:true }).ok);
 assert(t.count() == 0);
 v = t.validate(true);
 assert(v.ok);
diff --git a/jstests/compactPreservePadding.js b/jstests/compactPreservePadding.js
index 5357f5defe0..4748afb9a82 100644
--- a/jstests/compactPreservePadding.js
+++ b/jstests/compactPreservePadding.js
@@ -1,8 +1,8 @@
 // test preservePadding
 
-var db = db.getSiblingDB('compactPreservePadding');
+var mydb = db.getSiblingDB('compactPreservePadding');
 var collName = "compactPreservePadding";
-var t = db.getCollection(collName);
+var t = mydb.getCollection(collName);
 t.drop();
 
 // use larger keyname to avoid hitting an edge case with extents 
@@ -17,7 +17,7 @@ originalSize = t.stats().size;
 originalStorage = t.stats().storageSize;
 
 // compact!
-db.runCommand({compact: collName, preservePadding: true});
+mydb.runCommand({compact: collName, preservePadding: true});
 printjson(t.stats());
 
 // object sizes ('size') should be the same (unless we hit an edge case involving extents, which