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

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

storage/ndb/test/ndbapi/testBitfield.cpp

@@ -36,9 +36,10 @@ 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

@@ -525,6 +525,10 @@ max-time: 1000
 cmd: testNodeRestart
 args: -n Bug26457 T1
 
+max-time: 1000
+cmd: testNodeRestart
+args: -n Bug26481 T1
+
 #
 # DICT TESTS
 max-time: 1500