[svn-r15221] Description:

	Bring changes from trunk from the time the branch was created (r14280)
up to the 1.8.0 release (r14525) back into the metadata journaling branch.

Tested on:
        FreeBSD/32 6.2 (duty) in debug mode
        FreeBSD/64 6.2 (liberty) w/C++ & FORTRAN, in debug mode
        Linux/32 2.6 (kagiso) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe,
                                in debug mode
        Linux/64-amd64 2.6 (smirom) w/default API=1.6.x, w/C++ & FORTRAN,
                                in production mode
        Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
                                in production mode
        Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
                                w/szip filter, in production mode
        Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in production mode

1 files changed, 29 insertions, 29 deletions

diff --git a/tools/testfiles/tindicessub4.ddl b/tools/testfiles/tindicessub4.ddl
index 99fca01..a57bee6 100644
--- a/tools/testfiles/tindicessub4.ddl
+++ b/tools/testfiles/tindicessub4.ddl
@@ -1,40 +1,40 @@
 #############################
-Expected output for 'h5dump -d 4d -s 0,0,1,3 -c 2,2,6,4 taindices.h5'
+Expected output for 'h5dump -d 4d -s 0,0,1,2 -c 2,2,3,2 -S 1,1,3,3 -k 1,1,2,2 taindices.h5'
 #############################
 HDF5 "taindices.h5" {
 DATASET "4d" {
    DATATYPE  H5T_STD_I32LE
    DATASPACE  SIMPLE { ( 2, 2, 10, 10 ) / ( 2, 2, 10, 10 ) }
    SUBSET {
-      START ( 0, 0, 1, 3 );
-      STRIDE ( 1, 1, 1, 1 );
-      COUNT ( 2, 2, 6, 4 );
-      BLOCK ( 1, 1, 1, 1 );
+      START ( 0, 0, 1, 2 );
+      STRIDE ( 1, 1, 3, 3 );
+      COUNT ( 2, 2, 3, 2 );
+      BLOCK ( 1, 1, 2, 2 );
       DATA {
-      (0,0,1,3): 13, 14, 15, 16,
-      (0,0,2,3):  23, 24, 25, 26,
-      (0,0,3,3):  33, 34, 35, 36,
-      (0,0,4,3):  43, 44, 45, 46,
-      (0,0,5,3):  53, 54, 55, 56,
-      (0,0,6,3):  63, 64, 65, 66
-      (0,1,1,3):  113, 114, 115, 116,
-      (0,1,2,3):  123, 124, 125, 126,
-      (0,1,3,3):  133, 134, 135, 136,
-      (0,1,4,3):  143, 144, 145, 146,
-      (0,1,5,3):  153, 154, 155, 156,
-      (0,1,6,3):  163, 164, 165, 166
-      (1,0,1,3):  213, 214, 215, 216,
-      (1,0,2,3):  223, 224, 225, 226,
-      (1,0,3,3):  233, 234, 235, 236,
-      (1,0,4,3):  243, 244, 245, 246,
-      (1,0,5,3):  253, 254, 255, 256,
-      (1,0,6,3):  263, 264, 265, 266
-      (1,1,1,3):  313, 314, 315, 316,
-      (1,1,2,3):  323, 324, 325, 326,
-      (1,1,3,3):  333, 334, 335, 336,
-      (1,1,4,3):  343, 344, 345, 346,
-      (1,1,5,3):  353, 354, 355, 356,
-      (1,1,6,3):  363, 364, 365, 366
+      (0,0,1,2): 12, 13, 15, 16,
+      (0,0,2,2):  22, 23, 25, 26,
+      (0,0,4,2):  42, 43, 45, 46,
+      (0,0,5,2):  52, 53, 55, 56,
+      (0,0,7,2):  72, 73, 75, 76,
+      (0,0,8,2):  82, 83, 85, 86
+      (0,1,1,2):  112, 113, 115, 116,
+      (0,1,2,2):  122, 123, 125, 126,
+      (0,1,4,2):  142, 143, 145, 146,
+      (0,1,5,2):  152, 153, 155, 156,
+      (0,1,7,2):  172, 173, 175, 176,
+      (0,1,8,2):  182, 183, 185, 186
+      (1,0,1,2):  212, 213, 215, 216,
+      (1,0,2,2):  222, 223, 225, 226,
+      (1,0,4,2):  242, 243, 245, 246,
+      (1,0,5,2):  252, 253, 255, 256,
+      (1,0,7,2):  272, 273, 275, 276,
+      (1,0,8,2):  282, 283, 285, 286
+      (1,1,1,2):  312, 313, 315, 316,
+      (1,1,2,2):  322, 323, 325, 326,
+      (1,1,4,2):  342, 343, 345, 346,
+      (1,1,5,2):  352, 353, 355, 356,
+      (1,1,7,2):  372, 373, 375, 376,
+      (1,1,8,2):  382, 383, 385, 386
       }
    }
 }