bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:4260)

[Magnus Blåudd]

#At file:///home/msvensson/mysql/7.0/ based on revid:magnus.blaudd@stripped

 4260 Magnus Blåudd	2011-03-28
      ndb
       - adopt ndb_opts.c to 5.5.10 and trunk

    modified:
      storage/ndb/src/common/util/ndb_opts.c
=== modified file 'storage/ndb/src/common/util/ndb_opts.c'
--- a/storage/ndb/src/common/util/ndb_opts.c	2011-01-30 23:13:49 +0000
+++ b/storage/ndb/src/common/util/ndb_opts.c	2011-03-28 08:41:48 +0000
@@ -121,12 +121,12 @@ my_bool ndb_is_load_default_arg_separato
 #error "Need MYSQL_VERSION_ID defined"
 #endif
 
-#if MYSQL_VERSION_ID >= 50501
+#if MYSQL_VERSION_ID >= 50510
   /*
     load_default() in 5.5+ returns an extra arg which has to
     be skipped when processing the argv array
    */
-  if (arg == args_separator)
+  if (my_getopt_is_args_separator(arg))
     return TRUE;
 #else
   (void)arg;

Attachment: [text/bzr-bundle] bzr/[e-mail]