Changeset 36536 for branches/eam_branches/ipp-20140206/ippTools/share

Timestamp:

Feb 18, 2014, 2:53:55 PM (12 years ago)

Author:

eugene

Message:

merge from trunk

Location:

branches/eam_branches/ipp-20140206

Files:

• . (modified) (1 prop)
• ippTools/share (modified) (1 prop)
• ippTools/share/Makefile.am (modified) (1 diff)
• ippTools/share/camtool_find_pendingimfile.sql (modified) (1 prop)
• ippTools/share/chiptool_setimfiletoupdate.sql (modified) (1 prop)
• ippTools/share/pxadmin_create_tables.sql (modified) (1 diff, 1 prop)
• ippTools/share/remotetool_definebyquery_cam.sql (copied) (copied from trunk/ippTools/share/remotetool_definebyquery_cam.sql )
• ippTools/share/remotetool_definebyquery_chip.sql (copied) (copied from trunk/ippTools/share/remotetool_definebyquery_chip.sql )
• ippTools/share/remotetool_definebyquery_stack.sql (copied) (copied from trunk/ippTools/share/remotetool_definebyquery_stack.sql )
• ippTools/share/remotetool_definebyquery_warp.sql (copied) (copied from trunk/ippTools/share/remotetool_definebyquery_warp.sql )
• ippTools/share/remotetool_updatepoll.sql (copied) (copied from trunk/ippTools/share/remotetool_updatepoll.sql )
• ippTools/share/warptool_towarped.sql (modified) (1 prop)

branches/eam_branches/ipp-20140206/ippTools/share/Makefile.am

@@ -496 +496 @@
         fftool_summary.sql \
         fftool_todo.sql \
-        fftool_toadvance.sql
+        fftool_toadvance.sql \
+        remotetool_definebyquery_chip.sql \
+        remotetool_definebyquery_cam.sql \
+        remotetool_definebyquery_warp.sql \
+        remotetool_definebyquery_stack.sql \
+        remotetool_updatepoll.sql
 
+
+

branches/eam_branches/ipp-20140206/ippTools/share/pxadmin_create_tables.sql

@@ -2365 +2365 @@
 ) ENGINE=innodb DEFAULT CHARSET=latin1;
 
+CREATE TABLE remoteRun (
+    remote_id BIGINT NOT NULL AUTO_INCREMENT,
+    state     VARCHAR(64) NOT NULL,
+    stage     VARCHAR(64) NOT NULL,
+    label     VARCHAR(64) NOT NULL,
+    path_base VARCHAR(255) NOT NULL,
+    job_id    BIGINT,
+    last_poll TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    fault     SMALLINT NOT NULL,
+    PRIMARY KEY (remote_id),
+    KEY (state),
+    KEY (stage),
+    KEY (label),
+    KEY (job_id)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
+
+CREATE TABLE remoteComponent (
+    remote_id BIGINT,
+    stage_id  BIGINT,
+    KEY (stage_id),
+    FOREIGN KEY (remote_id) REFERENCES remoteRun(remote_id)
+) ENGINE=innodb DEFAULT CHARSET=latin1;
 
 -- These comment lines are here to avoid an empty query error.