bzr commit into mysql-5.1-telco-6.2 branch (jonas:2885)

[Jonas Oreland]

#At file:///home/jonas/src/telco-6.2/

 2885 Jonas Oreland	2009-03-18
      ndb - autotest - fix testTransactions
        which had unstable results from ReadEx/ScanEx vs SimpleRead
modified:
  storage/ndb/test/ndbapi/testTransactions.cpp

=== modified file 'storage/ndb/test/ndbapi/testTransactions.cpp'
--- a/storage/ndb/test/ndbapi/testTransactions.cpp	2008-11-08 20:45:48 +0000
+++ b/storage/ndb/test/ndbapi/testTransactions.cpp	2009-03-18 06:26:50 +0000
@@ -48,6 +48,17 @@ struct OperationTestCase {
 
 #define X -1
 
+/**
+ * //XX1 - SimpleRead can read either of primary/backup replicas
+ *         but uses locks. 
+ *         This means that combination of S-READ and ReadEx/ScanEx
+ *         will yield different result depending on which TC-node the S-READ
+ *         is started...
+ *
+ *         NOTE: S-READ vs DML is not unpredictable as DML locks both replicas
+ *        
+ *         Therefor those combinations are removed from the matrix
+ */
 OperationTestCase matrix[] = {
   { "ReadRead",         true, "READ",   1, "READ",      0, 1,   0, 1 },
   { "ReadReadEx",       true, "READ",   1, "READ-EX", 266, X,   0, 1 },
@@ -96,7 +107,7 @@ OperationTestCase matrix[] = {
 
   { "ScanExRead",       true, "SCAN-EX",1, "READ",    266, 1,   0, 1 },
   { "ScanExReadEx",     true, "SCAN-EX",1, "READ-EX", 266, 1,   0, 1 },
-  { "ScanExSimpleRead", true, "SCAN-EX",1, "S-READ",  266, 1,   0, 1 },
+//XX1  { "ScanExSimpleRead", true, "SCAN-EX",1, "S-READ",  266, 1,   0, 1 },
   { "ScanExDirtyRead",  true, "SCAN-EX",1, "D-READ",    0, 1,   0, 1 },
   { "ScanExInsert",     true, "SCAN-EX",1, "INSERT",  266, X,   0, 1 },
   { "ScanExUpdate",     true, "SCAN-EX",1, "UPDATE",  266, 2,   0, 1 },
@@ -128,7 +139,7 @@ OperationTestCase matrix[] = {
 
   { "ReadExRead",       true, "READ-EX",1, "READ",    266, X,   0, 1 },
   { "ReadExReadEx",     true, "READ-EX",1, "READ-EX", 266, X,   0, 1 },
-  { "ReadExSimpleRead", true, "READ-EX",1, "S-READ",  266, X,   0, 1 },
+//XX1  { "ReadExSimpleRead", true, "READ-EX",1, "S-READ",  266, X,   0, 1 },
   { "ReadExDirtyRead",  true, "READ-EX",1, "D-READ",    0, 1,   0, 1 },
   { "ReadExInsert",     true, "READ-EX",1, "INSERT",  266, X,   0, 1 },
   { "ReadExUpdate",     true, "READ-EX",1, "UPDATE",  266, X,   0, 1 },