Index: branches/haf_add201112/ippTools/share/mergetool_find_minidvodb_id.sql
===================================================================
--- branches/haf_add201112/ippTools/share/mergetool_find_minidvodb_id.sql	(revision 32980)
+++ branches/haf_add201112/ippTools/share/mergetool_find_minidvodb_id.sql	(revision 32980)
@@ -0,0 +1,8 @@
+SELECT minidvodbRun.* FROM minidvodbRun
+JOIN minidvodbProcessed USING(minidvodb_id)
+WHERE minidvodbRun.state = 'merged' and minidvodbProcessed.fault = 0
+    AND minidvodb_id NOT IN (SELECT minidvodb_id
+       FROM mergedvodbRun
+       JOIN minidvodbRun USING(minidvodb_id)
+       WHERE %s
+      )
Index: branches/haf_add201112/ippTools/share/mergetool_find_pending_merge.sql
===================================================================
--- branches/haf_add201112/ippTools/share/mergetool_find_pending_merge.sql	(revision 32980)
+++ branches/haf_add201112/ippTools/share/mergetool_find_pending_merge.sql	(revision 32980)
@@ -0,0 +1,11 @@
+SELECT
+    mergedvodbRun.*
+FROM mergedvodbRun
+LEFT JOIN mergedvodbProcessed
+    USING(merge_id)
+WHERE
+  (mergedvodbRun.state = 'new' AND mergedvodbProcessed.merge_id IS NULL)
+    AND mergedvodbRun.mergedvodb IS NOT NULL
+    AND mergedvodbRun.mergedvodb_path IS NOT NULL
+  
+
Index: branches/haf_add201112/ippTools/share/mergetool_find_pendingmergeprocess.sql
===================================================================
--- branches/haf_add201112/ippTools/share/mergetool_find_pendingmergeprocess.sql	(revision 32980)
+++ branches/haf_add201112/ippTools/share/mergetool_find_pendingmergeprocess.sql	(revision 32980)
@@ -0,0 +1,5 @@
+SELECT mergedvodbRun.* 
+FROM mergedvodbRun 
+LEFT JOIN mergedvodbProcessed
+USING(merge_id)
+WHERE (mergedvodbRun.state = 'new' AND mergedvodbProcessed.merge_id IS NULL)
Index: branches/haf_add201112/ippTools/share/mergetool_find_processed.sql
===================================================================
--- branches/haf_add201112/ippTools/share/mergetool_find_processed.sql	(revision 32980)
+++ branches/haf_add201112/ippTools/share/mergetool_find_processed.sql	(revision 32980)
@@ -0,0 +1,7 @@
+SELECT
+    mergedvodbProcessed.*,
+    mergedvodbRun.mergedvodb_path
+FROM mergedvodbProcessed
+JOIN mergedvodbRun
+    USING(merge_id)
+
Index: branches/haf_add201112/ippTools/share/mergetool_queue_merge_id.sql
===================================================================
--- branches/haf_add201112/ippTools/share/mergetool_queue_merge_id.sql	(revision 32980)
+++ branches/haf_add201112/ippTools/share/mergetool_queue_merge_id.sql	(revision 32980)
@@ -0,0 +1,11 @@
+INSERT INTO mergedvodbRun
+    SELECT
+        0,              -- merge_id
+	minidvodb_id,   -- minidvodb_id
+        '%s',           -- mergedvodb
+        '%s',           -- mergedvodb_path
+	'%s',           -- state
+    FROM minidvodbRun join minidvodbProcessed using (minidvodb_id)
+    WHERE
+        minidvodbRun.state = 'merged' and minidvodbProcessed.fault = 0
+        AND minidvodbRun.minidvodb_id = %lld
Index: branches/haf_add201112/ippTools/share/mergetool_queue_minidvodb_id.sql
===================================================================
--- branches/haf_add201112/ippTools/share/mergetool_queue_minidvodb_id.sql	(revision 32980)
+++ branches/haf_add201112/ippTools/share/mergetool_queue_minidvodb_id.sql	(revision 32980)
@@ -0,0 +1,15 @@
+INSERT INTO minidvodbCopy
+    SELECT
+        0,              -- minidvodbcopy_id
+        minidvodb_id,         -- minidvodb_id
+        '%s',           -- minidvodb_rsync_path
+        '%s',           -- destination_host
+	%d,           -- fault
+        '%s',           -- state
+        %s,           -- epoch
+        %f           -- dtime
+        
+    FROM minidvodbRun
+    WHERE
+        minidvodbRun.state = 'merged'
+        AND minidvodbRun.minidvodb_id = %lld
Index: branches/haf_add201112/ippTools/share/mergetool_revertmergedvodbprocessed.sql
===================================================================
--- branches/haf_add201112/ippTools/share/mergetool_revertmergedvodbprocessed.sql	(revision 32980)
+++ branches/haf_add201112/ippTools/share/mergetool_revertmergedvodbprocessed.sql	(revision 32980)
@@ -0,0 +1,6 @@
+DELETE FROM mergedvodbProcessed
+USING mergedvodbProcessed, mergedvodbRun
+WHERE
+    mergedvodbProcessed.merge_id = mergedvodbRun.merge_id
+    AND mergedvodbProcessed.fault != 0
+    AND mergedvodbRun.state = 'new'