Add detection of in_addr_t

Add pack_bits to pack_reclength for dynamic rows.  This solves buffer a possible buffer overflow on update.
(This will probably solve bug #563)
Fix test for available file descriptors in mysqltest
Fixed core dump bug in replication tests when running without transactional table support

1 files changed, 7 insertions, 7 deletions

diff --git a/extra/my_print_defaults.c b/extra/my_print_defaults.c
index 549b2124b55..41c26e73dff 100644
--- a/extra/my_print_defaults.c
+++ b/extra/my_print_defaults.c
@@ -136,18 +136,18 @@ int main(int argc, char **argv)
   arguments[0]=my_progname;
   arguments[1]=0;
   if ((error= load_defaults(config_file, (const char **) load_default_groups,
-			   &count, &arguments)) > 1)
+			   &count, &arguments)))
   {
     if (verbose && opt_defaults_file_used)
     {
-      if (error == 2)
-	fprintf(stderr, "WARNING: Defaults file (%s) not found!\n",
+      if (error == 1)
+	fprintf(stderr, "WARNING: Defaults file '%s' not found!\n",
 		config_file);
-      if (error == 3)
-	fprintf(stderr, "WARNING: Defaults file (%s) is not a regular file!\n",
+      if (error == 2)
+	fprintf(stderr, "WARNING: Defaults file '%s' is not a regular file!\n",
 		config_file);
     }
-    exit(2); // Non-fatal error
+    error= 2;
   }
 
   for (argument= arguments+1 ; *argument ; argument++)
@@ -155,5 +155,5 @@ int main(int argc, char **argv)
   my_free((char*) load_default_groups,MYF(0));
   free_defaults(arguments);
 
-  exit(0);
+  exit(error);
 }