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) List-Archive: http://lists.mysql.com/commits/144813 Message-Id: <20120919124053.25019.47825.4058@khepri17.no.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 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 @@ - - - - MySQL Cluster Configuration Help - - - - - - -

MySQL Cluster Configuration Help

-

Help Contents

-
  • Introduction
    • -
  • Define cluster
    • -
  • Define hosts
    • -
  • Define processes
    • -
  • Define parameters
    • -
  • Deploy cluster
    • - -

    Introduction

     -

    Define cluster

     -

    Define hosts

     -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. -

    Define processes

     -

    Define parameters

     -

    Deploy cluster

     - - - === 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).