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

[Magnus Blåudd]

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

 4277 Magnus Blåudd	2011-04-04 [merge]
      Merge

    modified:
      config/ac-macros/maintainer.m4
      mysql-test/mysql-test-run.pl
=== modified file 'config/ac-macros/maintainer.m4'
--- a/config/ac-macros/maintainer.m4	2010-11-05 13:17:47 +0000
+++ b/config/ac-macros/maintainer.m4	2011-04-04 07:02:01 +0000
@@ -17,7 +17,11 @@ AC_DEFUN([MY_MAINTAINER_MODE], [
 AC_DEFUN([MY_MAINTAINER_MODE_WARNINGS], [
   # Setup GCC warning options.
   AS_IF([test "$GCC" = "yes"], [
-    C_WARNINGS="-Wall -Wextra -Wunused -Wwrite-strings -Wno-strict-aliasing -Werror"
+    # MCP -->
+    # Remove the -Werror flag until storage/ndb produce no warnings
+    # C_WARNINGS="-Wall -Wextra -Wunused -Wwrite-strings -Wno-strict-aliasing -Werror"
+    C_WARNINGS="-Wall -Wextra -Wunused -Wwrite-strings -Wno-strict-aliasing"
+    # MCP <--
     CXX_WARNINGS="${C_WARNINGS} -Wno-unused-parameter"
     C_WARNINGS="${C_WARNINGS} -Wdeclaration-after-statement"
   ])

=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2011-03-22 13:16:46 +0000
+++ b/mysql-test/mysql-test-run.pl	2011-04-04 08:32:44 +0000
@@ -93,6 +93,7 @@ require "lib/mtr_misc.pl";
 $SIG{INT}= sub { mtr_error("Got ^C signal"); };
 
 our $mysql_version_id;
+my $mysql_version_extra;
 our $glob_mysql_test_dir;
 our $basedir;
 
@@ -1593,12 +1594,13 @@ sub collect_mysqld_features {
       # Look for version
       my $exe_name= basename($exe_mysqld);
       mtr_verbose("exe_name: $exe_name");
-      if ( $line =~ /^\S*$exe_name\s\sVer\s([0-9]*)\.([0-9]*)\.([0-9]*)/ )
+      if ( $line =~ /^\S*$exe_name\s\sVer\s([0-9]*)\.([0-9]*)\.([0-9]*)([^\s]*)/ )
       {
 	#print "Major: $1 Minor: $2 Build: $3\n";
 	$mysql_version_id= $1*10000 + $2*100 + $3;
 	#print "mysql_version_id: $mysql_version_id\n";
 	mtr_report("MySQL Version $1.$2.$3");
+	$mysql_version_extra= $4;
       }
     }
     else
@@ -2489,6 +2491,16 @@ sub vs_config_dirs ($$) {
 sub check_ndbcluster_support ($) {
   my $mysqld_variables= shift;
 
+  # Check if this is MySQL Cluster, ie. mysql version string ends
+  # with -ndb-Y.Y.Y[-status]
+  if ( defined $mysql_version_extra &&
+       $mysql_version_extra =~ /^-ndb-/ )
+  {
+    mtr_report(" - MySQL Cluster");
+    # Enable ndb engine in MySQL Cluster build
+    $opt_include_ndbcluster = 1;
+  }
+
   if ($opt_include_ndbcluster)
   {
     $opt_skip_ndbcluster= 0;

No bundle (reason: revision is a merge (you can force generation of a bundle with env var BZR_FORCE_BUNDLE=1)).