bzr push into mysql-5.1 branch (tomas.ulin:2709 to 2710)

[Tomas Ulin]

 2710 Tomas Ulin	2008-10-09 [merge]
      merge
modified:
  mysql-test/mysql-test-run.pl
  storage/ndb/include/util/ndb_opts.h

 2709 Tomas Ulin	2008-10-09 [merge]
      merge
modified:
  sql/ha_ndbcluster_binlog.cc
  sql/ha_ndbcluster_lock_ext.h

=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2008-10-03 11:57:41 +0000
+++ b/mysql-test/mysql-test-run.pl	2008-10-09 20:06:57 +0000
@@ -2821,7 +2821,7 @@ sub ndbd_start ($$$) {
   mtr_add_arg($args, "$extra_args");
 
   my $nodeid= $cluster->{'ndbds'}->[$idx]->{'nodeid'};
-  my $path_ndbd_log= "$cluster->{'data_dir'}/ndb_${nodeid}.log";
+  my $path_ndbd_log= "$cluster->{'data_dir'}/ndb_${nodeid}_out.log";
   $pid= mtr_spawn($exe_ndbd, $args, "",
 		  $path_ndbd_log,
 		  $path_ndbd_log,

=== modified file 'storage/ndb/include/util/ndb_opts.h'
--- a/storage/ndb/include/util/ndb_opts.h	2007-07-02 17:08:02 +0000
+++ b/storage/ndb/include/util/ndb_opts.h	2008-10-09 11:53:53 +0000
@@ -100,8 +100,13 @@ const char *opt_debug= 0;
 
 static void ndb_std_print_version()
 {
-  printf("MySQL distrib %s, for %s (%s)\n",
-	 NDB_VERSION_STRING,SYSTEM_TYPE,MACHINE_TYPE);
+#ifndef DBUG_OFF
+  const char *suffix= "-debug";
+#else
+  const char *suffix= "";
+#endif
+  printf("MySQL distrib %s%s, for %s (%s)\n",
+	 NDB_VERSION_STRING,suffix,SYSTEM_TYPE,MACHINE_TYPE);
 }
 
 static void usage();