Commit 2f7ad205 authored by unknown's avatar unknown
Browse files

Merge perch.ndb.mysql.com:/home/jonas/src/51-work 

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


storage/ndb/test/run-test/daily-basic-tests.txt:
  merge
parents 9ea32414 70a9812d

storage/ndb/test/ndbapi/testBitfield.cpp

+4 −3
Original line number Diff line number Diff line
@@ -36,8 +36,9 @@ main(int argc, char** argv){ 
  load_defaults("my",load_default_groups,&argc,&argv);

  int ho_error;



  argc--;

  argv++;

  if ((ho_error=handle_options(&argc, &argv, my_long_options,

			       ndb_std_get_one_option)))

    return NDBT_ProgramExit(NDBT_WRONGARGS);



  Ndb_cluster_connection con(opt_connect_str);

  if(con.connect(12, 5, 1))

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

+4 −0
Original line number Diff line number Diff line
@@ -533,6 +533,10 @@ max-time: 1000 
cmd: testNodeRestart

args: -n Bug26457 T1



max-time: 1000

cmd: testNodeRestart

args: -n Bug26481 T1



#

# DICT TESTS

max-time: 1500