Context Navigation

laptool.c

Timestamp:

Mar 30, 2012, 2:49:37 PM (14 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20111122/ippTools/src

Files:

Property svn:ignore

Property svn:mergeinfo changed

/branches/haf_add201112/ippTools/src (added)	merged: 32980,32986,33003,33023,33027
/trunk/ippTools/src	merged: 32942-32943,32960,32962,32975,33030-33031,33042-33043,33109,33111-33112,33119,33331-33337,33343,33384-33385,33525,33533,33617,33619,33625

-              r32422
+              r33638
   PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
+  PXOPT_LOOKUP_U64(limit,   config->args, "-limit",  false, false);
   psMetadata *where = psMetadataAlloc();
 …
     psStringAppend(&query, " WHERE %s", whereClause);
     psFree(whereClause);
+  }
+  if (limit) {
+    psString limitString = psDBGenerateLimitSQL(limit);
+    psStringAppend(&query, "\n %s", limitString);
+    psFree(limitString);
+  }

Note: See TracChangeset for help on using the changeset viewer.