Merge mysql.com:/home/jonas/src/mysql-4.1

into mysql.com:/home/jonas/src/mysql-5.0


ndb/test/run-test/daily-basic-tests.txt:
  Auto merged

ndb/test/run-test/daily-basic-tests.txt

@@ -6,26 +6,50 @@ max-time: 600
 cmd: atrt-testBackup
 args: -n NFMaster T1
 
+max-time: 600
+cmd: testBasic
+args: -n PkRead T1
+
 max-time: 600
 cmd: atrt-testBackup
 args: -n NFMasterAsSlave T1
 
+max-time: 600
+cmd: testBasic
+args: -n PkRead T1
+
 max-time: 600
 cmd: atrt-testBackup
 args: -n NFSlave T1 
 
+max-time: 600
+cmd: testBasic
+args: -n PkRead T1
+
 max-time: 600
 cmd: atrt-testBackup
 args: -n FailMaster T1
 
+max-time: 600
+cmd: testBasic
+args: -n PkRead T1
+
 max-time: 600
 cmd: atrt-testBackup
 args: -n FailMasterAsSlave T1
 
+max-time: 600
+cmd: testBasic
+args: -n PkRead T1
+
 max-time: 600
 cmd: atrt-testBackup
 args: -n FailSlave T1
 
+max-time: 600
+cmd: testBasic
+args: -n PkRead T1
+
 max-time: 600
 cmd: atrt-testBackup
 args: -n BackupOne T1 T6 T3 I3