Changeset 36370 for branches/eam_branches/ipp-20130904/ippTools/share

Timestamp:

Dec 10, 2013, 2:14:21 PM (13 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20130904

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 prop)
• ippTools/share/stacktool_addsummary.sql (modified) (1 diff)
• ippTools/share/stacktool_revertsummary.sql (copied) (copied from trunk/ippTools/share/stacktool_revertsummary.sql )
• ippTools/share/warptool_towarped.sql (modified) (1 prop)

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

@@ -400 +400 @@
         stacktool_tosummary.sql \
         stacktool_addsummary.sql \
+        stacktool_revertsummary.sql \
         stacktool_summary.sql \
         staticskytool_definebyquery_select.sql \

branches/eam_branches/ipp-20130904/ippTools/share/stacktool_addsummary.sql

@@ -1 +1 @@
 INSERT INTO stackSummary (sass_id,projection_cell,path_base) VALUES (
-       %lld,   -- warp_id
+       %lld,   -- sass_id
        '%s',   -- projection_cell
        '%s'    -- path_base