| commit | f4c33244d8176762cf2350dbb21a82ea692efcb5 | [log] [tgz] |
|---|---|---|
| author | kisskys <kisskys@eaa15691-b419-025a-1212-ee371bd00084> | Wed Mar 13 06:11:01 2013 +0000 |
| committer | kisskys <kisskys@eaa15691-b419-025a-1212-ee371bd00084> | Wed Mar 13 06:11:01 2013 +0000 |
| tree | 84dee26dddd9218777da79cbaf0a6515eaadd8f3 | |
| parent | f13583a2a3e5fa34dc8084e19f7aa417398cee29 [diff] [blame] | |
| parent | 153992b22de206a6d18b4dbc9b3056a712c6b4eb [diff] [blame] |
merge -r1055:1282 (merging from asterix_stabilization to asterix_lsm_stabilization) git-svn-id: https://asterixdb.googlecode.com/svn/branches/asterix_lsm_stabilization@1322 eaa15691-b419-025a-1212-ee371bd00084
diff --git a/asterix-app/src/test/resources/runtimets/queries/index-selection/btree-index-composite-key-mixed-intervals.aql b/asterix-app/src/test/resources/runtimets/queries/index-selection/btree-index-composite-key-mixed-intervals.aql index 79060d9..90d4cb9 100644 --- a/asterix-app/src/test/resources/runtimets/queries/index-selection/btree-index-composite-key-mixed-intervals.aql +++ b/asterix-app/src/test/resources/runtimets/queries/index-selection/btree-index-composite-key-mixed-intervals.aql
@@ -20,7 +20,7 @@ dept:string } -create dataset employee(Emp) partitioned by key id; +create dataset employee(Emp) primary key id; load dataset employee using "edu.uci.ics.asterix.external.dataset.adapter.NCFileSystemAdapter"