Changeset 36441 for trunk/ippTools/share
- Timestamp:
- Jan 14, 2014, 2:28:47 PM (12 years ago)
- Location:
- trunk
- Files:
-
- 8 edited
- 9 copied
-
. (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/fftool_definebyquery.sql (copied) (copied from branches/bills_branches/bills_201312/ippTools/share/fftool_definebyquery.sql )
-
ippTools/share/fftool_definebyquery_select_warps.sql (copied) (copied from branches/bills_branches/bills_201312/ippTools/share/fftool_definebyquery_select_warps.sql )
-
ippTools/share/fftool_result.sql (copied) (copied from branches/bills_branches/bills_201312/ippTools/share/fftool_result.sql )
-
ippTools/share/fftool_revert.sql (copied) (copied from branches/bills_branches/bills_201312/ippTools/share/fftool_revert.sql )
-
ippTools/share/fftool_revertsummary.sql (copied) (copied from branches/bills_branches/bills_201312/ippTools/share/fftool_revertsummary.sql )
-
ippTools/share/fftool_summary.sql (copied) (copied from branches/bills_branches/bills_201312/ippTools/share/fftool_summary.sql )
-
ippTools/share/fftool_summaryinputs.sql (copied) (copied from branches/bills_branches/bills_201312/ippTools/share/fftool_summaryinputs.sql )
-
ippTools/share/fftool_toadvance.sql (copied) (copied from branches/bills_branches/bills_201312/ippTools/share/fftool_toadvance.sql )
-
ippTools/share/fftool_todo.sql (copied) (copied from branches/bills_branches/bills_201312/ippTools/share/fftool_todo.sql )
-
ippTools/share/pxadmin_create_tables.sql (modified) (1 diff, 1 prop)
-
ippTools/share/pxadmin_drop_tables.sql (modified) (1 diff)
-
ippTools/share/warptool_towarped.sql (modified) (1 prop)
Legend:
- Unmodified
- Added
- Removed
-
trunk
- Property svn:mergeinfo changed
/branches/bills_branches/bills_201312 (added) merged: 36383,36386,36388-36396,36406-36407,36409-36412,36415-36420,36422-36427,36433,36436-36439
- Property svn:mergeinfo changed
-
trunk/ippTools/share
- Property svn:mergeinfo changed
/branches/bills_branches/bills_201312/ippTools/share (added) merged: 36386,36390,36409,36411,36415-36417,36437
- Property svn:mergeinfo changed
-
trunk/ippTools/share/Makefile.am
r36361 r36441 488 488 releasetool_definerelgroup_select_exp_lap.sql \ 489 489 releasetool_stacksummary.sql \ 490 releasetool_pendingrelgroup.sql 490 releasetool_pendingrelgroup.sql \ 491 fftool_definebyquery.sql \ 492 fftool_definebyquery_select_warps.sql \ 493 fftool_result.sql \ 494 fftool_revert.sql \ 495 fftool_revertsummary.sql \ 496 fftool_summary.sql \ 497 fftool_todo.sql \ 498 fftool_toadvance.sql 491 499 -
trunk/ippTools/share/camtool_find_pendingimfile.sql
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/ippTools/share/chiptool_setimfiletoupdate.sql
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/ippTools/share/pxadmin_create_tables.sql
- Property svn:mergeinfo changed
/branches/bills_branches/bills_201312/ippTools/share/pxadmin_create_tables.sql (added) merged: 36386,36409,36415
r36374 r36441 2307 2307 ) ENGINE=InnoDB DEFAULT CHARSET=latin1; 2308 2308 2309 CREATE TABLE fullForceRun ( 2310 ff_id BIGINT NOT NULL AUTO_INCREMENT, 2311 skycal_id BIGINT, 2312 sources_path_base VARCHAR(255), 2313 state VARCHAR(64), 2314 workdir VARCHAR(255), 2315 label VARCHAR(64), 2316 data_group VARCHAR(64), 2317 dist_group VARCHAR(64), 2318 note VARCHAR(255), 2319 reduction VARCHAR(64), 2320 registered TIMESTAMP DEFAULT CURRENT_TIMESTAMP, -- time run was registered 2321 PRIMARY KEY(ff_id), 2322 KEY(state), 2323 KEY(label), 2324 KEY(data_group), 2325 KEY(skycal_id), 2326 FOREIGN KEY(skycal_id) REFERENCES skycalRun(skycal_id) 2327 ) ENGINE=innodb DEFAULT CHARSET=latin1; 2328 2329 CREATE TABLE fullForceInput ( 2330 ff_id BIGINT, 2331 warp_id BIGINT, 2332 PRIMARY KEY(ff_id, warp_id), 2333 FOREIGN KEY(ff_id) REFERENCES fullForceRun(ff_id), 2334 FOREIGN KEY(warp_id) REFERENCES warpRun(warp_id) 2335 ) ENGINE=innodb DEFAULT CHARSET=latin1; 2336 2337 CREATE TABLE fullForceResult ( 2338 ff_id BIGINT, 2339 warp_id BIGINT, 2340 path_base VARCHAR(255) NOT NULL, 2341 dtime_script FLOAT, 2342 quality SMALLINT NOT NULL, 2343 hostname VARCHAR(64) NOT NULL, 2344 software_ver VARCHAR(16), 2345 fault SMALLINT NOT NULL, 2346 PRIMARY KEY(ff_id, warp_id), 2347 KEY(fault), 2348 KEY(quality), 2349 FOREIGN KEY(ff_id) REFERENCES fullForceRun(ff_id), 2350 FOREIGN KEY(warp_id) REFERENCES warpRun(warp_id) 2351 ) ENGINE=innodb DEFAULT CHARSET=latin1; 2352 2353 CREATE TABLE fullForceSummary ( 2354 ff_id BIGINT, 2355 path_base VARCHAR(255) NOT NULL, 2356 dtime_script FLOAT, 2357 quality SMALLINT NOT NULL, 2358 hostname VARCHAR(64) NOT NULL, 2359 software_ver VARCHAR(16), 2360 fault SMALLINT NOT NULL, 2361 PRIMARY KEY(ff_id), 2362 KEY(fault), 2363 KEY(quality), 2364 FOREIGN KEY(ff_id) REFERENCES fullForceRun(ff_id) 2365 ) ENGINE=innodb DEFAULT CHARSET=latin1; 2366 2309 2367 2310 2368 -- These comment lines are here to avoid an empty query error. - Property svn:mergeinfo changed
-
trunk/ippTools/share/pxadmin_drop_tables.sql
r35896 r36441 120 120 DROP TABLE IF EXISTS dqstatsContent; 121 121 DROP TABLE IF EXISTS dqstatsRun; 122 DROP TABLE IF EXISTS fullForceRun; 123 DROP TABLE IF EXISTS fullForceInput; 124 DROP TABLE IF EXISTS fullForceResult; 125 DROP TABLE IF EXISTS fullForceSummary; 126 122 127 123 128 SET FOREIGN_KEY_CHECKS=1 -
trunk/ippTools/share/warptool_towarped.sql
- Property svn:mergeinfo changed (with no actual effect on merging)
Note:
See TracChangeset
for help on using the changeset viewer.
