Merged asterix_lsm_stabilization upto r1547

git-svn-id: https://asterixdb.googlecode.com/svn/trunk@1622 eaa15691-b419-025a-1212-ee371bd00084
diff --git a/asterix/asterix-app/src/test/resources/optimizerts/queries/rtree-secondary-index.aql b/asterix/asterix-app/src/test/resources/optimizerts/queries/rtree-secondary-index.aql
index d525458..41a5a91 100644
--- a/asterix/asterix-app/src/test/resources/optimizerts/queries/rtree-secondary-index.aql
+++ b/asterix/asterix-app/src/test/resources/optimizerts/queries/rtree-secondary-index.aql
@@ -10,13 +10,14 @@
   line2: line,
   poly1: polygon,
   poly2: polygon,
-  rec: rectangle
+  rec: rectangle,
+  circle: circle
 }
 
 create nodegroup group1  if not exists on nc1, nc2;
 
 create dataset MyData(MyRecord)
-  partitioned by key id on group1;
+  primary key id on group1;
 
 load dataset MyData 
 using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"