List:Commits« Previous MessageNext Message »
From:Dyre Tjeldvoll Date:September 19 2012 12:40pm
Subject:bzr push into mysql-5.5-cluster-7.2 branch (Dyre.Tjeldvoll:4057 to 4058)
View as plain text  
 4058 Sivert Sorumgaard	2012-09-19
      hg changeset: 249:92cf6d2cf9b7
      Trunc calculation of NoOfFragmentLogFiles

    removed:
      storage/ndb/mcc/frontend/help.html
    modified:
      storage/ndb/mcc/frontend/js/mcc/configuration/calculations.js
      storage/ndb/mcc/frontend/js/mcc/gui/wizard.js
 4057 bernd.ocklin@stripped	2012-09-19
      fix python environment PYTHONLIB

    modified:
      storage/ndb/mcc/setup-debug.bat.in
      storage/ndb/mcc/setup.bat.in
=== removed file 'storage/ndb/mcc/frontend/help.html'

=== removed file 'storage/ndb/mcc/frontend/help.html'
--- a/storage/ndb/mcc/frontend/help.html	2012-07-09 07:07:31 +0000
+++ b/storage/ndb/mcc/frontend/help.html	1970-01-01 00:00:00 +0000
@@ -1,36 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html dir="ltr">
-    <head>
-        <title>MySQL Cluster Configuration Help</title>
-        <link href="img/favicon.ico" rel="icon" type="image/x-icon"/>
-        <link rel="stylesheet" type="text/css" 
-                href="dojo/dijit/themes/claro/claro.css"/>
-
-        <script src="dojo/dojo/dojo.js" djConfig="parseOnLoad: true"></script>
-    </head>
-    <body class="claro">
-        <h1>MySQL Cluster Configuration Help</h1>
-        <h2>Help Contents</h2>
-        <li><a href="#introduction">Introduction</a></li>
-        <li><a href="#configWizardDefineCluster">Define cluster</a></li>
-        <li><a href="#configWizardDefineHosts">Define hosts</a></li>
-        <li><a href="#configWizardDefineProcesses">Define processes</a></li>
-        <li><a href="#configWizardDefineParameters">Define parameters</a></li>
-        <li><a href="#configWizardDeployConfig">Deploy cluster</a></li>
-
-        <a name="introduction"><h2>Introduction</h2></a>
-        <a name="configWizardDefineCluster"><h2>Define cluster</h2></a>
-        <a name="configWizardDefineHosts"><h2>Define hosts</h2></a>
-Hosts can be added by pressing the "Add hosts" button and entering a list of comma separated host names or ip addresses.
-
-If the setting "Automatically get resource information for new hosts" is checked in the settings menu, the platform, RAM size and number of CPU cores
-will be filled in automatically and displayed in the grid. Otherwise, an ellipsis in the grid will indicate that the information was not
-obtained. 
-
-The hardware resource information can be edited by the user by clicking the appropriate cell in the grid. 
-        <a name="configWizardDefineProcesses"><h2>Define processes</h2></a>
-        <a name="configWizardDefineParameters"><h2>Define parameters</h2></a>
-        <a name="configWizardDeployConfig"><h2>Deploy cluster</h2></a>
-    </body>
-</html>
-

=== modified file 'storage/ndb/mcc/frontend/js/mcc/configuration/calculations.js'
--- a/storage/ndb/mcc/frontend/js/mcc/configuration/calculations.js	2012-09-17 11:32:04 +0000
+++ b/storage/ndb/mcc/frontend/js/mcc/configuration/calculations.js	2012-09-19 12:40:08 +0000
@@ -392,7 +392,7 @@
                     // Caclulate and set number of files
                     var dataMem = mcc.configuration.getPara(processtype, null, 
                                     "DataMemory", "defaultValueType");
-                    var noOfFiles = 6 * dataMem / fileSz / 4;
+                    var noOfFiles = Math.floor(6 * dataMem / fileSz / 4);
 
                     // At least three files in each set
                     if (noOfFiles < 3) {

=== modified file 'storage/ndb/mcc/frontend/js/mcc/gui/wizard.js'
--- a/storage/ndb/mcc/frontend/js/mcc/gui/wizard.js	2012-09-07 13:31:09 +0000
+++ b/storage/ndb/mcc/frontend/js/mcc/gui/wizard.js	2012-09-19 12:40:08 +0000
@@ -626,11 +626,11 @@
     var menuItemContents = new dijit.MenuItem({
         label: "Contents",
         onClick: function() {
-            window.open("help.html",
+            window.open("help/html/help.html",
                 "MySQL Cluster Configuration",
                 "scrollbars=1, \
-                width=750, \
-                height=650, \
+                width=1170, \
+                height=750, \
                 screenX=20, \
                 screenY=100, \
                 left=20, \
@@ -649,11 +649,11 @@
             if (current) {
                 helpLabel = "#" + current.id;
             }
-            window.open("help.html" + helpLabel, 
+            window.open("help/html/help_cnt.html" + helpLabel, 
                 "MySQL Cluster Configuration",
                 "scrollbars=1, \
-                width=750, \
-                height=650, \
+                width=1170, \
+                height=750, \
                 screenX=20, \
                 screenY=100, \
                 left=20, \

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-5.5-cluster-7.2 branch (Dyre.Tjeldvoll:4057 to 4058) Dyre Tjeldvoll19 Sep