MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:kent Date:June 12 2008 9:36pm
Subject:bk commit into 5.1 tree (kent:1.2548)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of kent.  When kent does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-06-12 23:36:26+02:00, kent@stripped +2 -0
  mysqlbinlog.cc:
    Enable binloggin of MySQL Cluster that has major version 6
  mysql-test-run.pl:
    MySQL Cluster 6.2.15 is based on 5.1.x

  client/mysqlbinlog.cc@stripped, 2008-06-12 23:36:00+02:00, kent@stripped +1 -0
    Enable binloggin of MySQL Cluster that has major version 6

  mysql-test/mysql-test-run.pl@stripped, 2008-06-12 23:34:57+02:00, kent@stripped +9 -2
    MySQL Cluster 6.2.15 is based on 5.1.x

diff -Nrup a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc
--- a/client/mysqlbinlog.cc	2008-02-08 18:16:56 +01:00
+++ b/client/mysqlbinlog.cc	2008-06-12 23:36:00 +02:00
@@ -1400,6 +1400,7 @@ static Exit_status check_master_version(
     glob_description_event= new Format_description_log_event(3);
     break;
   case '5':
+  case '6':
     /*
       The server is soon going to send us its Format_description log
       event, unless it is a 5.0 server with 3.23 or 4.0 binlogs.
diff -Nrup a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
--- a/mysql-test/mysql-test-run.pl	2008-02-25 14:50:15 +01:00
+++ b/mysql-test/mysql-test-run.pl	2008-06-12 23:34:57 +02:00
@@ -100,6 +100,7 @@ $Devel::Trace::TRACE= 1;
 
 # Misc global variables
 our $mysql_version_id;
+our $mysql_cluster_product;
 our $glob_mysql_test_dir=         undef;
 our $glob_mysql_bench_dir=        undef;
 our $glob_scriptname=             undef;
@@ -1457,12 +1458,18 @@ 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]*)(.*)/ )
       {
 	#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");
+
+        # Find out if this is the Cluster product, that has its own
+        # numbering, MySQL Cluster 6.2 and up are not related to
+        # the normal MySQL Server when it comes to numbering.
+        $mysql_cluster_product=
+          ($mysql_version_id > 60200 and $4 =~ /MySQL Cluster/);
       }
     }
     else
@@ -3999,7 +4006,7 @@ sub mysqld_arguments ($$$$) {
     }
     else
     {
-      if ($mysql_version_id < 50200)
+      if ($mysql_version_id < 50200 or $mysql_cluster_product)
       {
         mtr_add_arg($args, "%s--master-user=root", $prefix);
         mtr_add_arg($args, "%s--master-connect-retry=1", $prefix);
Thread
bk commit into 5.1 tree (kent:1.2548)kent12 Jun