MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Jonathan.Miller Date:March 4 2009 4:15pm
Subject:bzr commit into mysql-6.0-telco-6.4 branch (Jonathan.Miller:2848) Bug#37287
View as plain text  
#At file:///space/jmiller/clones/mysql-6.0-telco-6.4/ based on revid:tomas.ulin@stripped

 2848 Jonathan.Miller@stripped	2009-03-04
      Bug#37287
      Updates old replication setting to include --loose so new version will ignore and older version will use.
      
      In addition, fixed replication setup bug.
      modified:
        storage/ndb/test/run-test/db.cpp
        storage/ndb/test/run-test/setup.cpp

=== modified file 'storage/ndb/test/run-test/db.cpp'
--- a/storage/ndb/test/run-test/db.cpp	2008-12-19 06:40:28 +0000
+++ b/storage/ndb/test/run-test/db.cpp	2009-03-04 16:14:28 +0000
@@ -473,7 +473,7 @@ setup_repl(atrt_config& config)
     atrt_process * dst = config.m_processes[i];
     if (dst->m_rep_src)
     {
-      if (setup_repl(dst->m_rep_src, dst) != true)
+      if (setup_repl(dst, dst->m_rep_src) != true)
 	return false;
     }
   }

=== modified file 'storage/ndb/test/run-test/setup.cpp'
--- a/storage/ndb/test/run-test/setup.cpp	2008-12-12 17:34:22 +0000
+++ b/storage/ndb/test/run-test/setup.cpp	2009-03-04 16:14:28 +0000
@@ -37,10 +37,10 @@ struct proc_option f_options[] = {
   ,{ "--host=",        atrt_process::AP_CLIENT, 0 }
   ,{ "--server-id=",   atrt_process::AP_MYSQLD, PO_REP }
   ,{ "--log-bin",      atrt_process::AP_MYSQLD, PO_REP_MASTER }
-  ,{ "--master-host=", atrt_process::AP_MYSQLD, PO_REP_SLAVE }
-  ,{ "--master-port=", atrt_process::AP_MYSQLD, PO_REP_SLAVE }
-  ,{ "--master-user=", atrt_process::AP_MYSQLD, PO_REP_SLAVE }
-  ,{ "--master-password=", atrt_process::AP_MYSQLD, PO_REP_SLAVE }
+  ,{ "--loose-master-host=", atrt_process::AP_MYSQLD, PO_REP_SLAVE }
+  ,{ "--loose-master-port=", atrt_process::AP_MYSQLD, PO_REP_SLAVE }
+  ,{ "--loose-master-user=", atrt_process::AP_MYSQLD, PO_REP_SLAVE }
+  ,{ "--loose-master-password=", atrt_process::AP_MYSQLD, PO_REP_SLAVE }
   ,{ "--ndb-connectstring=", atrt_process::AP_MYSQLD | atrt_process::AP_CLUSTER
      ,PO_NDB }
   ,{ "--ndbcluster", atrt_process::AP_MYSQLD, PO_NDB }
@@ -768,14 +768,15 @@ generate(atrt_process& proc, const char 
     opts.m_generated.put(name, "");
     return true;
   }
-  else if (strcmp(name, "--master-host=") == 0)
+
+  else if (strcmp(name, "--loose-master-host=") == 0)
   {
     require(proc.m_rep_src != 0);
     opts.m_loaded.put(name, proc.m_rep_src->m_host->m_hostname.c_str());
     opts.m_generated.put(name, proc.m_rep_src->m_host->m_hostname.c_str());
     return true;
   }
-  else if (strcmp(name, "--master-port=") == 0)
+  else if (strcmp(name, "--loose-master-port=") == 0)
   {
     const char* val;
     require(proc.m_rep_src->m_options.m_loaded.get("--port=", &val));
@@ -783,13 +784,13 @@ generate(atrt_process& proc, const char 
     opts.m_generated.put(name, val);
     return true;
   }
-  else if (strcmp(name, "--master-user=") == 0)
+  else if (strcmp(name, "--loose-master-user=") == 0)
   {
     opts.m_loaded.put(name, "root");
     opts.m_generated.put(name, "root");
     return true;
   }
-  else if (strcmp(name, "--master-password=") == 0)
+  else if (strcmp(name, "--loose-master-password=") == 0)
   {
     opts.m_loaded.put(name, "\"\"");
     opts.m_generated.put(name, "\"\"");

Thread
bzr commit into mysql-6.0-telco-6.4 branch (Jonathan.Miller:2848) Bug#37287Jonathan.Miller4 Mar