Index: branches/haf_add201112/ippTools/share/Makefile.am
===================================================================
--- trunk/ippTools/share/Makefile.am	(revision 32833)
+++ branches/haf_add201112/ippTools/share/Makefile.am	(revision 32979)
@@ -310,4 +310,10 @@
 	minidvodbtool_queue_minidvodb_id.sql \
 	minidvodbtool_revertminidvodbcopy.sql \
+	mergetool_find_minidvodb_id.sql \
+	mergetool_find_pendingmergeprocess.sql \
+	mergetool_find_pending_merge.sql \
+	mergetool_find_processed.sql \
+	mergetool_queue_merge_id.sql \
+	mergetool_revertmergedvodbprocessed.sql \
 	pstamptool_completedreq.sql \
 	pstamptool_datastore.sql \
Index: branches/haf_add201112/ippTools/share/pxadmin_create_tables.sql
===================================================================
--- trunk/ippTools/share/pxadmin_create_tables.sql	(revision 32833)
+++ branches/haf_add201112/ippTools/share/pxadmin_create_tables.sql	(revision 32979)
@@ -535,4 +535,5 @@
     stage VARCHAR(64),
     stage_id BIGINT,
+    stage_extra1 INT,
     state VARCHAR(64),
     workdir VARCHAR(255),
@@ -1985,5 +1986,4 @@
 ) ENGINE=innodb DEFAULT CHARSET=latin1;
 
-
 CREATE TABLE minidvodbCopy (
     minidvodbcopy_id     BIGINT AUTO_INCREMENT,
@@ -1999,4 +1999,45 @@
     FOREIGN KEY(minidvodb_id) REFERENCES minidvodbRun(minidvodb_id)
 ) ENGINE=innodb DEFAULT CHARSET=latin1;
+
+CREATE TABLE mergedvodbRun (
+       merge_id BIGINT AUTO_INCREMENT,
+       minidvodb_id BIGINT,
+       minidvodb_group VARCHAR(64) NOT NULL,
+       minidvodb_path VARCHAR(255) NOT NULL,
+       mergedvodb_path VARCHAR(255) NOT NULL,
+       state VARCHAR(64) NOT NULL,
+       creation_date TIMESTAMP,
+       PRIMARY KEY(merge_id), KEY(minidvodb_id), KEY(minidvodb_group), INDEX(merge_id)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+
+CREATE TABLE mergedvodbProcessed (
+      merge_id BIGINT,
+      merge_order BIGINT,
+      dtime_verify FLOAT,
+      dtime_merge FLOAT,
+      dtime_script FLOAT,
+      epoch timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+      fault SMALLINT NOT NULL,
+      UNIQUE KEY (merge_id),
+      KEY(merge_id),
+      FOREIGN KEY(merge_id) REFERENCES mergedvodbRun(merge_id)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+
+CREATE TABLE mergedvodbCopy (
+    mergedvodbcopy_id     BIGINT AUTO_INCREMENT,
+    merge_id     BIGINT,
+    mergedvodb_rsync_path VARCHAR(255) NOT NULL,
+    destination_host VARCHAR(255) NOT NULL,
+    fault  SMALLINT NOT NULL,
+    state   VARCHAR(64) NOT NULL,
+    epoch TIMESTAMP,
+    dtime FLOAT,
+    PRIMARY KEY(mergedvodbcopy_id),
+    KEY(merge_id),
+    FOREIGN KEY(merge_id) REFERENCES mergedvodbRun(merge_id)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+
+
+
 CREATE TABLE vpRun (
     vp_id BIGINT AUTO_INCREMENT,
Index: branches/haf_add201112/ippTools/src/Makefile.am
===================================================================
--- trunk/ippTools/src/Makefile.am	(revision 32833)
+++ branches/haf_add201112/ippTools/src/Makefile.am	(revision 32979)
@@ -29,4 +29,5 @@
 	diffphottool \
 	minidvodbtool \
+	mergetool \
 	laptool \
 	vptool
@@ -43,4 +44,5 @@
 	pxmagic.h \
 	pxminidvodb.h \
+	pxmerge.h \
 	pxregister.h \
 	pxspace.h \
@@ -79,4 +81,5 @@
 	diffphottool.h \
 	minidvodbtool.h \
+	mergetool.h \
 	laptool.h \
 	vptool.h
@@ -98,4 +101,5 @@
 	pxmagic.c \
 	pxminidvodb.c \
+	pxmerge.c \
 	pxregister.c \
 	pxspace.c \
@@ -294,4 +298,13 @@
     minidvodbtoolConfig.c
 
+mergetool_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS)
+mergetool_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la
+mergetool_SOURCES = \
+    mergetool.c \
+    mergetoolConfig.c
+
+
+
+
 laptool_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS)
 laptool_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la