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/ndbapi/testBitfield.cpp

@@ -8,6 +8,15 @@
 static const char* _dbname = "TEST_DB";
 static int g_loops = 7;
 
+
+NDB_STD_OPTS_VARS;
+
+static struct my_option my_long_options[] =
+{
+  NDB_STD_OPTS("ndb_desc"),
+  { 0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
+};
+
 static void usage()
 {
   ndb_std_print_version();