bzr push into mysql-5.1 branch (jonas:2762 to 2763)

[Jonas Oreland]

 2763 Jonas Oreland	2008-12-03
      ndb autotest - remove extra empty lines
modified:
  storage/ndb/test/run-test/daily-basic-tests.txt

 2762 Jonas Oreland	2008-12-03 [merge]
      merge with 5.1-telco-6.2-merge
modified:
  mysql-test/suite/ndb/t/ndb_dd_dump.test

=== modified file 'storage/ndb/test/run-test/daily-basic-tests.txt'
--- a/storage/ndb/test/run-test/daily-basic-tests.txt	2008-11-08 21:08:06 +0000
+++ b/storage/ndb/test/run-test/daily-basic-tests.txt	2008-12-03 20:11:52 +0000
@@ -1157,22 +1157,18 @@ cmd: testNdbApi
 args: -l 100 -n Bug37158
 
 # EOF 2008-06-03
-
 max-time: 500
 cmd: test_event
 args -n bug37672 T1
 
 #EOF 2008-07-04
-
 max-time: 500
 cmd: testScanFilter
 args: 
 
 #EOF 2008-07-09
-
 max-time: 600
 cmd: test_event
 args -r 5000 -n Bug30780 T1
 
 #EOF 2008-08-11
-